update master

.gitignore

@@ -14,5 +14,4 @@ nbproject
 Thumbs.db
 *.sublime-project
 *.sublime-workspace
-
 composer.lock

Bootstrap.php

@@ -2,35 +2,15 @@
 
 namespace filsh\yii2\oauth2server;
 
-use yii\web\GroupUrlRule;
-
+/**
+ * Instead use bootstrap module
+ * should be removed in v2.1 version
+ * 
+ * @deprecated v2.0.1
+ */
 class Bootstrap implements \yii\base\BootstrapInterface
 {
-    /**
-     * @var array Model's map
-     */
-    private $_modelMap = [
-        'OauthClients'               => 'filsh\yii2\oauth2server\models\OauthClients',
-        'OauthAccessTokens'          => 'filsh\yii2\oauth2server\models\OauthAccessTokens',
-        'OauthAuthorizationCodes'    => 'filsh\yii2\oauth2server\models\OauthAuthorizationCodes',
-        'OauthRefreshTokens'         => 'filsh\yii2\oauth2server\models\OauthRefreshTokens',
-        'OauthScopes'                => 'filsh\yii2\oauth2server\models\OauthScopes',
-    ];
-
-    /**
-     * @var array Storage's map
-     */
-    private $_storageMap = [
-        'access_token'          => 'filsh\yii2\oauth2server\storage\Pdo',
-        'authorization_code'    => 'filsh\yii2\oauth2server\storage\Pdo',
-        'client_credentials'    => 'filsh\yii2\oauth2server\storage\Pdo',
-        'client'                => 'filsh\yii2\oauth2server\storage\Pdo',
-        'refresh_token'         => 'filsh\yii2\oauth2server\storage\Pdo',
-        'user_credentials'      => 'filsh\yii2\oauth2server\storage\Pdo',
-        'public_key'            => 'filsh\yii2\oauth2server\storage\Pdo',
-        'jwt_bearer'            => 'filsh\yii2\oauth2server\storage\Pdo',
-        'scope'                 => 'filsh\yii2\oauth2server\storage\Pdo',
-    ];
+    use BootstrapTrait;
 
     /**
      * @inheritdoc
@@ -39,21 +19,11 @@ public function bootstrap($app)
     {
         /** @var $module Module */
         if ($app->hasModule('oauth2') && ($module = $app->getModule('oauth2')) instanceof Module) {
-            $this->_modelMap = array_merge($this->_modelMap, $module->modelMap);
-            foreach ($this->_modelMap as $name => $definition) {
-                \Yii::$container->set("filsh\\yii2\\oauth2server\\models\\" . $name, $definition);
-                $module->modelMap[$name] = is_array($definition) ? $definition['class'] : $definition;
-            }
-
-            $this->_storageMap = array_merge($this->_storageMap, $module->storageMap);
-            foreach ($this->_storageMap as $name => $definition) {
-                \Yii::$container->set($name, $definition);
-                $module->storageMap[$name] = is_array($definition) ? $definition['class'] : $definition;
-            }
+            $this->initModule($module);
 
             if ($app instanceof \yii\console\Application) {
                 $module->controllerNamespace = 'filsh\yii2\oauth2server\commands';
             }
         }
     }
-}
+}

BootstrapTrait.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace filsh\yii2\oauth2server;
+
+trait BootstrapTrait
+{
+    /**
+     * @var array Model's map
+     */
+    private $_modelMap = [
+        'OauthClients'               => 'filsh\yii2\oauth2server\models\OauthClients',
+        'OauthAccessTokens'          => 'filsh\yii2\oauth2server\models\OauthAccessTokens',
+        'OauthAuthorizationCodes'    => 'filsh\yii2\oauth2server\models\OauthAuthorizationCodes',
+        'OauthRefreshTokens'         => 'filsh\yii2\oauth2server\models\OauthRefreshTokens',
+        'OauthScopes'                => 'filsh\yii2\oauth2server\models\OauthScopes',
+    ];
+
+    /**
+     * @var array Storage's map
+     */
+    private $_storageMap = [
+        'access_token'          => 'filsh\yii2\oauth2server\storage\Pdo',
+        'authorization_code'    => 'filsh\yii2\oauth2server\storage\Pdo',
+        'client_credentials'    => 'filsh\yii2\oauth2server\storage\Pdo',
+        'client'                => 'filsh\yii2\oauth2server\storage\Pdo',
+        'refresh_token'         => 'filsh\yii2\oauth2server\storage\Pdo',
+        'user_credentials'      => 'filsh\yii2\oauth2server\storage\Pdo',
+        'public_key'            => 'filsh\yii2\oauth2server\storage\Pdo',
+        'jwt_bearer'            => 'filsh\yii2\oauth2server\storage\Pdo',
+        'scope'                 => 'filsh\yii2\oauth2server\storage\Pdo',
+    ];
+
+    protected function initModule(Module $module)
+    {
+        $this->_modelMap = array_merge($this->_modelMap, $module->modelMap);
+        foreach ($this->_modelMap as $name => $definition) {
+            \Yii::$container->set("filsh\\yii2\\oauth2server\\models\\" . $name, $definition);
+            $module->modelMap[$name] = is_array($definition) ? $definition['class'] : $definition;
+        }
+
+        $this->_storageMap = array_merge($this->_storageMap, $module->storageMap);
+        foreach ($this->_storageMap as $name => $definition) {
+            \Yii::$container->set($name, $definition);
+            $module->storageMap[$name] = is_array($definition) ? $definition['class'] : $definition;
+        }
+    }
+}

Module.php

@@ -49,6 +49,11 @@ class Module extends \yii\base\Module
      */
     public $grantTypes = [];
 
+    /**
+     * @var array server options
+     */
+    public $options = [];
+
     /**
      * @var string name of access token parameter
      */
@@ -62,7 +67,6 @@ class Module extends \yii\base\Module
      * @var bool whether to use JWT tokens
      */
     public $useJwtToken = false;//ADDED
-
     /**
      * @inheritdoc
      */
@@ -88,7 +92,7 @@ public function getServer()
             if($this->useJwtToken)
             {
                 if(!array_key_exists('access_token', $this->storageMap) || !array_key_exists('public_key', $this->storageMap)) {
-                        throw new \yii\base\InvalidConfigException('access_token and public_key must be set or set useJwtToken to false');
+                    throw new \yii\base\InvalidConfigException('access_token and public_key must be set or set useJwtToken to false');
                 }
                 //define dependencies when JWT is used instead of normal token
                 \Yii::$container->clear('public_key'); //remove old definition
@@ -105,15 +109,16 @@ public function getServer()
 
             $grantTypes = [];
             foreach($this->grantTypes as $name => $options) {
-                if(!isset($storages[$name]) || empty($options['class'])) {
+                $storageName = !empty($options['storageName']) ? $options['storageName'] : $name;
+                if(!isset($storages[$storageName]) || empty($options['class'])) {
                     throw new \yii\base\InvalidConfigException('Invalid grant types configuration.');
                 }
 
                 $class = $options['class'];
                 unset($options['class']);
 
                 $reflection = new \ReflectionClass($class);
-                $config = array_merge([0 => $storages[$name]], [$options]);
+                $config = array_merge([0 => $storages[$storageName]], [$options]);
 
                 $instance = $reflection->newInstanceArgs($config);
                 $grantTypes[$name] = $instance;
@@ -122,12 +127,12 @@ public function getServer()
             $server = \Yii::$container->get(Server::className(), [
                 $this,
                 $storages,
-                [
+                array_merge(array_filter([
                     'use_jwt_access_tokens' => $this->useJwtToken,//ADDED
                     'token_param_name' => $this->tokenParamName,
                     'access_lifetime' => $this->tokenAccessLifetime,
                     /** add more ... */
-                ],
+                ]), $this->options),
                 $grantTypes
             ]);
 
@@ -147,7 +152,7 @@ public function getRequest()
 
     public function getResponse()
     {
-        if(!ArrayHelper::keyExists('request', $this->getComponents())) {
+        if(!ArrayHelper::keyExists('response', $this->getComponents())) {
             $this->set('response', new Response());
         }
         return $this->get('response');