Oauth2 wrapper integration

Author: Maliy Igor

Module.php

@@ -12,8 +12,21 @@ class Module extends \yii\base\Module
 
     public $storageDefault = 'filsh\yii2\oauth2server\storage\Pdo';
 
+    public $modelClasses = [];
+    
     private $_server;
 
+    private $_models = [];
+    
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+        $this->modelClasses = array_merge($this->getDefaultModelClasses(), $this->modelClasses);
+    }
+    
     public function getServer($force = false)
     {
         if($this->_server === null || $force === true) {
@@ -68,4 +81,38 @@ protected function createStorage()
 
         return $storages;
     }
+    
+    /**
+     * Get object instance of model
+     * @param string $name
+     * @param array $config
+     * @return ActiveRecord
+     */
+    public function model($name, $config = [])
+    {
+        // return object if already created
+        if(!empty($this->_models[$name])) {
+            return $this->_models[$name];
+        }
+
+        // create object
+        $className = $this->modelClasses[ucfirst($name)];
+        $this->_models[$name] = Yii::createObject(array_merge(["class" => $className], $config));
+        return $this->_models[$name];
+    }
+    
+    /**
+     * Get default model classes
+     */
+    protected function getDefaultModelClasses()
+    {
+        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',
+        ];
+    }
+    
 }

controllers/DefaultController.php

@@ -2,13 +2,9 @@
 
 namespace filsh\yii2\oauth2server\controllers;
 
-use \Yii;
+use Yii;
 use yii\helpers\ArrayHelper;
-use yii\filters\auth\CompositeAuth;
-use yii\filters\auth\HttpBearerAuth;
-
-use filsh\yii2\oauth2server\filters\ExceptionFilter;
-use filsh\yii2\oauth2server\filters\auth\QueryParamAuth;
+use filsh\yii2\oauth2server\filters\ErrorToExceptionFilter;
 
 class DefaultController extends \yii\rest\Controller
 {
@@ -18,16 +14,8 @@ class DefaultController extends \yii\rest\Controller
     public function behaviors()
     {
         return ArrayHelper::merge(parent::behaviors(), [
-            'authenticator' => [
-                'class' => CompositeAuth::className(),
-                'authMethods' => [
-                    HttpBearerAuth::className(),
-                    QueryParamAuth::className(),
-                ],
-                'except' => ['token']
-            ],
             'exceptionFilter' => [
-                'class' => ExceptionFilter::className()
+                'class' => ErrorToExceptionFilter::className()
             ],
         ]);
     }
@@ -40,16 +28,4 @@ public function actionToken()
 
         return $response->getParameters();
     }
-    
-    public function actionResource()
-    {
-        $server = Yii::$app->getModule('oauth2')->getServer();
-        $request = Yii::$app->getModule('oauth2')->getRequest();
-        
-        if (!$server->verifyResourceRequest($request)) {
-            return $server->getResponse()->getParameters();
-        }
-        
-        return ['success' => true, 'message' => 'You accessed my APIs!'];
-    }
 }

filters/ExceptionFilter.php renamed to filters/ErrorToExceptionFilter.php

@@ -5,7 +5,7 @@
 use Yii;
 use yii\base\Controller;
 
-class ExceptionFilter extends yii\base\Behavior
+class ErrorToExceptionFilter extends yii\base\Behavior
 {
     public function events()
     {
@@ -20,12 +20,17 @@ public function events()
     public function afterAction($event)
     {
         $response = Yii::$app->getModule('oauth2')->getServer()->getResponse();
-        if($response !== null && !$response->isSuccessful()) {
+        
+        $isValid = true;
+        if($response !== null) {
+            $isValid = $response->isInformational() || $response->isSuccessful() || $response->isRedirection();
+        }
+        if(!$isValid) {
             $status = $response->getStatusCode();
             // TODO: необходимо также пробрасывать error_uri
             $message = $response->getParameter('error_description');
             if($message === null) {
-                $message = P::t('yii', 'An internal server error occurred.');
+                $message = Yii::t('yii', 'An internal server error occurred.');
             }
             throw new \yii\web\HttpException($status, $message);
         }

filters/auth/QueryParamAuth.php renamed to filters/auth/CompositeAuth.php

@@ -4,24 +4,16 @@
 
 use \Yii;
 
-class QueryParamAuth extends \yii\filters\auth\QueryParamAuth
+class CompositeAuth extends \yii\filters\auth\CompositeAuth
 {
-    /**
-     * @inheritdoc
-     */
-    public $tokenParam = 'access_token';
-    
-    /**
-     * @inheritdoc
-     */
     public function authenticate($user, $request, $response)
     {
         $oauthsServer = Yii::$app->getModule('oauth2')->getServer();
         $oauthRequest = Yii::$app->getModule('oauth2')->getRequest();
-        if (!$oauthsServer->verifyResourceRequest($oauthRequest)) {
-            $this->handleFailure($response);
-        } else {
+        if ($oauthsServer->verifyResourceRequest($oauthRequest)) {
             return parent::authenticate($user, $request, $response);
         }
+        
+        return null;
     }
 }

migrations/m140501_075311_add_oauth2_server.php

@@ -15,7 +15,7 @@ public function up()
         try {
             $this->createTable('{{%oauth_clients}}', [
                 'client_id' => Schema::TYPE_STRING . '(32) NOT NULL',
-                'client_secret' => Schema::TYPE_STRING . '(32) NOT NULL',
+                'client_secret' => Schema::TYPE_STRING . '(32) DEFAULT NULL',
                 'redirect_uri' => Schema::TYPE_STRING . '(1000) NOT NULL',
                 'grant_types' => Schema::TYPE_STRING . '(100) NOT NULL',
                 'scope' => Schema::TYPE_STRING . '(2000) DEFAULT NULL',
@@ -76,7 +76,7 @@ public function up()
 
             // insert client data
             $this->batchInsert('{{%oauth_clients}}', ['client_id', 'client_secret', 'redirect_uri', 'grant_types'], [
-                ['testclient', 'testpass', 'http://fake/', 'client_credentials password'],
+                ['testclient', 'testpass', 'http://fake/', 'client_credentials authorization_code password implicit'],
             ]);
 
             $transaction->commit();