v2.0.0

Author: filsh

.gitignore

@@ -0,0 +1,57 @@
+<?php
+
+namespace filsh\yii2\oauth2server;
+
+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',
+    ];
+    
+    /**
+     * @inheritdoc
+     */
+    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;
+            }
+            
+            if ($app instanceof \yii\console\Application) {
+                $module->controllerNamespace = 'filsh\yii2\oauth2server\commands';
+            }
+        }
+    }
+}

Bootstrap.php

@@ -3,6 +3,7 @@
 namespace filsh\yii2\oauth2server;
 
 use \Yii;
+use yii\i18n\PhpMessageSource;
 
 /**
  * For example,
@@ -35,31 +36,35 @@
  */
 class Module extends \yii\base\Module
 {
-    public $options = [];
+    const VERSION = '2.0.0';
 
+    /**
+     * @var array Model's map
+     */
+    public $modelMap = [];
+    
+    /**
+     * @var array Storage's map
+     */
     public $storageMap = [];
 
-    public $storageDefault = 'filsh\yii2\oauth2server\storage\Pdo';
 
-    public $grantTypes = [];
 
-    public $modelClasses = [];
 
-    public $i18n;
-
+    public $options = [];
+    
+    public $grantTypes = [];
+    
     private $_server;
 
     private $_request;
 
-    private $_models = [];
-    
     /**
      * @inheritdoc
      */
     public function init()
     {
         parent::init();
-        $this->modelClasses = array_merge($this->getDefaultModelClasses(), $this->modelClasses);
         $this->registerTranslations();
     }
 
@@ -71,7 +76,10 @@ public function init()
     public function getServer($force = false)
     {
         if($this->_server === null || $force === true) {
-            $storages = $this->createStorages();
+            $storages = [];
+            foreach($this->storageMap as $name => $value) {
+                $storages[$name] = \Yii::$container->get($name);
+            }
             $server = new \OAuth2\Server($storages, $this->options);
 
             foreach($this->grantTypes as $name => $options) {
@@ -114,86 +122,28 @@ public function getResponse()
     {
         return new \OAuth2\Response();
     }
-
-    /**
-     * Create storages
-     * @return type
-     */
-    public function createStorages()
-    {
-        $connection = Yii::$app->getDb();
-        if(!$connection->getIsActive()) {
-            $connection->open();
-        }
-        
-        $storages = [];
-        foreach($this->storageMap as $name => $storage) {
-            $storages[$name] = Yii::createObject($storage);
-        }
-        
-        $defaults = [
-            'access_token',
-            'authorization_code',
-            'client_credentials',
-            'client',
-            'refresh_token',
-            'user_credentials',
-            'public_key',
-            'jwt_bearer',
-            'scope',
-        ];
-        foreach($defaults as $name) {
-            if(!isset($storages[$name])) {
-                $storages[$name] = Yii::createObject($this->storageDefault);
-            }
-        }
-        
-        return $storages;
-    }
 
-    /**
-     * Get object instance of model
-     * @param string $name
-     * @param array $config
-     * @return ActiveRecord
-     */
-    public function model($name, $config = [])
-    {
-        if(!isset($this->_models[$name])) {
-            $className = $this->modelClasses[ucfirst($name)];
-            $this->_models[$name] = Yii::createObject(array_merge(['class' => $className], $config));
-        }
-        return $this->_models[$name];
-    }
+    
+    
+    
+    
 
     /**
      * Register translations for this module
      * @return array
      */
     public function registerTranslations()
     {
-        Yii::setAlias('@oauth2server', dirname(__FILE__));
-        if (empty($this->i18n)) {
-            $this->i18n = [
-                'class' => 'yii\i18n\PhpMessageSource',
-                'basePath' => '@oauth2server/messages',
+        if(!isset(Yii::$app->get('i18n')->translations['modules/oauth2/*'])) {
+            Yii::$app->get('i18n')->translations['modules/oauth2/*'] = [
+                'class'    => PhpMessageSource::className(),
+                'basePath' => __DIR__ . '/messages',
             ];
         }
-        Yii::$app->i18n->translations['oauth2server'] = $this->i18n;
     }
-
-    /**
-     * Get default model classes
-     * @return array
-     */
-    protected function getDefaultModelClasses()
+    
+    public static function t($category, $message, $params = [], $language = null)
     {
-        return [
-            'Clients' => 'filsh\yii2\oauth2server\models\OauthClients',
-            'AccessTokens' => 'filsh\yii2\oauth2server\models\OauthAccessTokens',
-            'AuthorizationCodes' => 'filsh\yii2\oauth2server\models\OauthAuthorizationCodes',
-            'RefreshTokens' => 'filsh\yii2\oauth2server\models\OauthRefreshTokens',
-            'Scopes' => 'filsh\yii2\oauth2server\models\OauthScopes',
-        ];
+        return Yii::t('modules/oauth2/' . $category, $message, $params, $language);
     }
 }

LICENSE

@@ -25,6 +25,7 @@
         }
     },
     "extra": {
+        "bootstrap": "filsh\\yii2\\oauth2server\\Bootstrap",
         "branch-alias": {
             "dev-master": "1.0.x-dev"
         }

Module.php

@@ -4,6 +4,7 @@
 
 use Yii;
 use yii\base\Controller;
+use filsh\yii2\oauth2server\Module;
 
 class ErrorToExceptionFilter extends \yii\base\Behavior
 {
@@ -28,9 +29,9 @@ public function afterAction($event)
         if(!$isValid) {
             $status = $response->getStatusCode();
             // TODO: необходимо также пробрасывать error_uri
-            $message = Yii::t('oauth2server', $response->getParameter('error_description'));
+            $message = Module::t('common', $response->getParameter('error_description'));
             if($message === null) {
-                $message = Yii::t('yii', 'An internal server error occurred.');
+                $message = Module::t('common', 'An internal server error occurred.');
             }
             throw new \yii\web\HttpException($status, $message);
         }