kaijung
diff --git a/‎.travis.yml
Lines changed: 3 additions & 3 deletions b/‎.travis.yml
Lines changed: 3 additions & 3 deletions
diff --git a/‎composer.json
Lines changed: 10 additions & 9 deletions b/‎composer.json
Lines changed: 10 additions & 9 deletions
diff --git a/‎src/OAuth2/Storage/Mongo.php
Lines changed: 53 additions & 0 deletions b/‎src/OAuth2/Storage/Mongo.php
Lines changed: 53 additions & 0 deletions
@@ -11,7 +11,6 @@ php:
 - 5.6
 - 7.0
 - 7.1
-- hhvm
 env:
   global:
   - secure: Bc5ZqvZ1YYpoPZNNuU2eCB8DS6vBYrAdfBtTenBs5NSxzb+Vjven4kWakbzaMvZjb/Ib7Uph7DGuOtJXpmxnvBXPLd707LZ89oFWN/yqQlZKCcm8iErvJCB5XL+/ONHj2iPdR242HJweMcat6bMCwbVWoNDidjtWMH0U2mYFy3M=
@@ -22,10 +21,11 @@ services:
 - cassandra
 before_install:
 - phpenv config-rm xdebug.ini || return 0
+- phpenv version-name | grep ^5.[3-6] && composer remove mongodb/mongodb --dev && echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
+- phpenv version-name | grep ^7 && echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
 install:
-- composer install --no-interaction
+- composer install
 before_script:
 - psql -c 'create database oauth2_server_php;' -U postgres
-- phpenv version-name | grep ^5.[3-6] && echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
 after_script:
 - php test/cleanup.php
@@ -12,22 +12,23 @@
         }
     ],
     "homepage": "http://github.com/bshaffer/oauth2-server-php",
-    "require":{
-        "php":">=5.3.9"
-    },
     "autoload": {
         "psr-0": { "OAuth2": "src/" }
     },
-    "suggest": {
-        "predis/predis": "Required to use the Redis storage engine",
-        "thobbs/phpcassa": "Required to use the Cassandra storage engine",
-        "aws/aws-sdk-php": "~2.8 is required to use the DynamoDB storage engine",
-        "firebase/php-jwt": "~2.2 is required to use JWT features"
+    "require":{
+        "php":">=5.3.9"
     },
     "require-dev": {
         "aws/aws-sdk-php": "~2.8",
         "firebase/php-jwt": "~2.2",
         "predis/predis": "dev-master",
-        "thobbs/phpcassa": "dev-master"
+        "thobbs/phpcassa": "dev-master",
+        "mongodb/mongodb": "^1.1"
+    },
+    "suggest": {
+        "predis/predis": "Required to use Redis storage",
+        "thobbs/phpcassa": "Required to use Cassandra storage",
+        "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
+        "firebase/php-jwt": "~1.1 is required to use MondoDB storage"
     }
 }
@@ -22,6 +22,7 @@ class Mongo implements AuthorizationCodeInterface,
     UserCredentialsInterface,
     RefreshTokenInterface,
     JwtBearerInterface,
+    PublicKeyInterface,
     OpenIDAuthorizationCodeInterface
 {
     protected $db;
@@ -46,6 +47,7 @@ public function __construct($connection, $config = array())
             'refresh_token_table' => 'oauth_refresh_tokens',
             'code_table' => 'oauth_authorization_codes',
             'user_table' => 'oauth_users',
+            'key_table' => 'oauth_keys',
             'jwt_table' => 'oauth_jwt',
         ), $config);
     }
@@ -336,4 +338,55 @@ public function setJti($client_id, $subject, $audience, $expiration, $jti)
         //TODO: Needs mongodb implementation.
         throw new \Exception('setJti() for the MongoDB driver is currently unimplemented.');
     }
+
+    public function getPublicKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['public_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['public_key'];
+    }
+
+    public function getPrivateKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['private_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['private_key'];
+    }
+
+    public function getEncryptionAlgorithm($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['encryption_algorithm'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? 'RS256' : $result['encryption_algorithm'];
+    }
 }