Implementation to use interfaces for actions, so that they may be ove…

src/base/Oauth2BaseModule.php

@@ -35,11 +35,19 @@
 use rhertogh\Yii2Oauth2Server\components\server\Oauth2AuthorizationServer;
 use rhertogh\Yii2Oauth2Server\components\server\Oauth2ResourceServer;
 use rhertogh\Yii2Oauth2Server\components\server\responses\Oauth2BearerTokenResponse;
+use rhertogh\Yii2Oauth2Server\controllers\web\certificates\Oauth2JwksAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\consent\Oauth2AuthorizeClientAction;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2CertificatesController;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2ConsentController;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2OidcController;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2ServerController;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2WellKnownController;
+use rhertogh\Yii2Oauth2Server\controllers\web\openidconnect\Oauth2OidcEndSessionAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\openidconnect\Oauth2OidcUserinfoAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2AccessTokenAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2AuthorizeAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2RevokeAction;
+use rhertogh\Yii2Oauth2Server\controllers\web\wellknown\Oauth2OpenidConfigurationAction;
 use rhertogh\Yii2Oauth2Server\interfaces\components\authorization\Oauth2ClientAuthorizationRequestInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\authorization\Oauth2ScopeAuthorizationRequestInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\encryption\Oauth2CryptographerInterface;
@@ -70,11 +78,19 @@
 use rhertogh\Yii2Oauth2Server\interfaces\components\server\Oauth2AuthorizationServerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\server\Oauth2ResourceServerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\server\responses\Oauth2BearerTokenResponseInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\certificates\Oauth2JwksActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\consent\Oauth2AuthorizeClientActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2CertificatesControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2ConsentControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2OidcControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2ServerControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2WellKnownControllerInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcEndSessionActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcUserinfoActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AccessTokenActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AuthorizeActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2RevokeActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\wellknown\Oauth2OpenidConfigurationActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\external\user\Oauth2OidcUserInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\Oauth2AccessTokenInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\Oauth2AccessTokenScopeInterface;
@@ -320,6 +336,15 @@ abstract class Oauth2BaseModule extends Module
         Oauth2WellKnownControllerInterface::class => Oauth2WellKnownController::class,
         Oauth2CertificatesControllerInterface::class => Oauth2CertificatesController::class,
         Oauth2OidcControllerInterface::class => Oauth2OidcController::class,
+        # Actions
+        Oauth2OpenidConfigurationActionInterface::class => Oauth2OpenidConfigurationAction::class,
+        Oauth2RevokeActionInterface::class => Oauth2RevokeAction::class,
+        Oauth2AuthorizeActionInterface::class => Oauth2AuthorizeAction::class,
+        Oauth2AccessTokenActionInterface::class => Oauth2AccessTokenAction::class,
+        Oauth2OidcUserinfoActionInterface::class => Oauth2OidcUserinfoAction::class,
+        Oauth2OidcEndSessionActionInterface::class => Oauth2OidcEndSessionAction::class,
+        Oauth2AuthorizeClientActionInterface::class => Oauth2AuthorizeClientAction::class,
+        Oauth2JwksActionInterface::class => Oauth2JwksAction::class,
         # Components (Server)
         Oauth2AuthorizationServerInterface::class => Oauth2AuthorizationServer::class,
         Oauth2ResourceServerInterface::class => Oauth2ResourceServer::class,

src/controllers/web/Oauth2CertificatesController.php

@@ -3,7 +3,7 @@
 namespace rhertogh\Yii2Oauth2Server\controllers\web;
 
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseApiController;
-use rhertogh\Yii2Oauth2Server\controllers\web\certificates\Oauth2JwksAction;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\certificates\Oauth2JwksActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2CertificatesControllerInterface;
 use yii\filters\VerbFilter;
 use yii\helpers\ArrayHelper;
@@ -31,7 +31,7 @@ public function behaviors()
     public function actions()
     {
         return [
-            static::ACTION_NAME_JWKS => Oauth2JwksAction::class,
+            static::ACTION_NAME_JWKS => Oauth2JwksActionInterface::class,
         ];
     }
 }

src/controllers/web/Oauth2ConsentController.php

@@ -3,7 +3,7 @@
 namespace rhertogh\Yii2Oauth2Server\controllers\web;
 
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseWebController;
-use rhertogh\Yii2Oauth2Server\controllers\web\consent\Oauth2AuthorizeClientAction;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\consent\Oauth2AuthorizeClientActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2ConsentControllerInterface;
 use yii\filters\VerbFilter;
 
@@ -31,7 +31,7 @@ public function actions()
     {
         return [
             static::ACTION_NAME_AUTHORIZE_CLIENT => [
-                'class' => Oauth2AuthorizeClientAction::class,
+                'class' => Oauth2AuthorizeClientActionInterface::class,
                 'clientAuthorizationView' => $this->module->clientAuthorizationView,
             ],
         ];

src/controllers/web/Oauth2OidcController.php

@@ -3,10 +3,10 @@
 namespace rhertogh\Yii2Oauth2Server\controllers\web;
 
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseApiController;
-use rhertogh\Yii2Oauth2Server\controllers\web\openidconnect\Oauth2OidcEndSessionAction;
-use rhertogh\Yii2Oauth2Server\controllers\web\openidconnect\Oauth2OidcUserinfoAction;
 use rhertogh\Yii2Oauth2Server\filters\auth\Oauth2HttpBearerAuth;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2OidcControllerInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcEndSessionActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcUserinfoActionInterface;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
 use yii\helpers\ArrayHelper;
@@ -53,8 +53,8 @@ public function behaviors()
     public function actions()
     {
         return [
-            static::ACTION_NAME_USERINFO => Oauth2OidcUserinfoAction::class,
-            static::ACTION_END_SESSION => Oauth2OidcEndSessionAction::class,
+            static::ACTION_NAME_USERINFO => Oauth2OidcUserinfoActionInterface::class,
+            static::ACTION_END_SESSION => Oauth2OidcEndSessionActionInterface::class,
         ];
     }
 }

src/controllers/web/Oauth2ServerController.php

@@ -3,9 +3,9 @@
 namespace rhertogh\Yii2Oauth2Server\controllers\web;
 
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseApiController;
-use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2AccessTokenAction;
-use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2AuthorizeAction;
-use rhertogh\Yii2Oauth2Server\controllers\web\server\Oauth2RevokeAction;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AccessTokenActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AuthorizeActionInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2RevokeActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2ServerControllerInterface;
 use yii\filters\VerbFilter;
 use yii\helpers\ArrayHelper;
@@ -35,9 +35,9 @@ public function behaviors()
     public function actions()
     {
         return [
-            static::ACTION_NAME_ACCESS_TOKEN => Oauth2AccessTokenAction::class,
-            static::ACTION_NAME_AUTHORIZE => Oauth2AuthorizeAction::class,
-            static::ACTION_NAME_REVOKE => Oauth2RevokeAction::class,
+            static::ACTION_NAME_ACCESS_TOKEN => Oauth2AccessTokenActionInterface::class,
+            static::ACTION_NAME_AUTHORIZE => Oauth2AuthorizeActionInterface::class,
+            static::ACTION_NAME_REVOKE => Oauth2RevokeActionInterface::class,
         ];
     }
 }

src/controllers/web/Oauth2WellKnownController.php

@@ -3,8 +3,8 @@
 namespace rhertogh\Yii2Oauth2Server\controllers\web;
 
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseApiController;
-use rhertogh\Yii2Oauth2Server\controllers\web\wellknown\Oauth2OpenidConfigurationAction;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2WellKnownControllerInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\wellknown\Oauth2OpenidConfigurationActionInterface;
 use yii\filters\VerbFilter;
 use yii\helpers\ArrayHelper;
 
@@ -31,7 +31,7 @@ public function behaviors()
     public function actions()
     {
         return [
-            static::ACTION_NAME_OPENID_CONFIGURATION => Oauth2OpenidConfigurationAction::class,
+            static::ACTION_NAME_OPENID_CONFIGURATION => Oauth2OpenidConfigurationActionInterface::class,
         ];
     }
 }

src/controllers/web/certificates/Oauth2JwksAction.php

@@ -6,13 +6,14 @@
 use Jose\Component\Core\JWKSet;
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseWebAction;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2CertificatesController;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\certificates\Oauth2JwksActionInterface;
 use yii\base\InvalidConfigException;
 use yii\helpers\StringHelper;
 
 /**
  * @property Oauth2CertificatesController $controller
  */
-class Oauth2JwksAction extends Oauth2BaseWebAction
+class Oauth2JwksAction extends Oauth2BaseWebAction implements Oauth2JwksActionInterface
 {
     /**
      * RFC7517: JSON Web Key (JWK)

src/controllers/web/consent/Oauth2AuthorizeClientAction.php

@@ -5,6 +5,7 @@
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseWebAction;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2ConsentController;
 use rhertogh\Yii2Oauth2Server\exceptions\Oauth2ServerHttpException;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\consent\Oauth2AuthorizeClientActionInterface;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\web\BadRequestHttpException;
@@ -14,7 +15,7 @@
 /**
  * @property Oauth2ConsentController $controller
  */
-class Oauth2AuthorizeClientAction extends Oauth2BaseWebAction
+class Oauth2AuthorizeClientAction extends Oauth2BaseWebAction implements Oauth2AuthorizeClientActionInterface
 {
     /**
      * Path to view file for client authorization.

src/controllers/web/openidconnect/Oauth2OidcEndSessionAction.php

@@ -14,6 +14,7 @@
 use rhertogh\Yii2Oauth2Server\controllers\web\base\Oauth2BaseWebAction;
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2OidcController;
 use rhertogh\Yii2Oauth2Server\helpers\UrlHelper;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcEndSessionActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\external\user\Oauth2OidcUserInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\Oauth2ClientInterface;
 use Yii;
@@ -26,7 +27,7 @@
 /**
  * @property Oauth2OidcController $controller
  */
-class Oauth2OidcEndSessionAction extends Oauth2BaseWebAction
+class Oauth2OidcEndSessionAction extends Oauth2BaseWebAction implements Oauth2OidcEndSessionActionInterface
 {
     /**
      * @see https://openid.net/specs/openid-connect-rpinitiated-1_0.html

src/controllers/web/openidconnect/Oauth2OidcUserinfoAction.php

@@ -7,6 +7,7 @@
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\request\Oauth2OidcAuthenticationRequestInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\scope\Oauth2OidcClaimInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\scope\Oauth2OidcScopeInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect\Oauth2OidcUserinfoActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\external\user\Oauth2OidcUserInterface;
 use rhertogh\Yii2Oauth2Server\Oauth2Module;
 use Yii;
@@ -17,7 +18,7 @@
 /**
  * @property Oauth2OidcController $controller
  */
-class Oauth2OidcUserinfoAction extends Oauth2BaseWebAction
+class Oauth2OidcUserinfoAction extends Oauth2BaseWebAction implements Oauth2OidcUserinfoActionInterface
 {
     /**
      * @see https://openid.net/specs/openid-connect-core-1_0.html#UserInfo

src/controllers/web/server/Oauth2AccessTokenAction.php

@@ -5,13 +5,14 @@
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2ServerController;
 use rhertogh\Yii2Oauth2Server\controllers\web\server\base\Oauth2BaseServerAction;
 use rhertogh\Yii2Oauth2Server\helpers\Psr7Helper;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AccessTokenActionInterface;
 use Yii;
 use yii\web\HttpException;
 
 /**
  * @property Oauth2ServerController $controller
  */
-class Oauth2AccessTokenAction extends Oauth2BaseServerAction
+class Oauth2AccessTokenAction extends Oauth2BaseServerAction implements Oauth2AccessTokenActionInterface
 {
     /**
      * @throws HttpException

src/controllers/web/server/Oauth2AuthorizeAction.php

@@ -12,6 +12,7 @@
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\request\Oauth2OidcAuthenticationRequestInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\scope\Oauth2OidcScopeInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\components\openidconnect\user\Oauth2OidcUserComponentInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2AuthorizeActionInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\external\user\Oauth2UserAuthenticatedAtInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\models\Oauth2ClientInterface;
 use rhertogh\Yii2Oauth2Server\Oauth2Module;
@@ -24,7 +25,7 @@
 /**
  * @property Oauth2ServerController $controller
  */
-class Oauth2AuthorizeAction extends Oauth2BaseServerAction
+class Oauth2AuthorizeAction extends Oauth2BaseServerAction implements Oauth2AuthorizeActionInterface
 {
     public function run($clientAuthorizationRequestId = null)
     {

src/controllers/web/server/Oauth2RevokeAction.php

@@ -11,6 +11,7 @@
 use rhertogh\Yii2Oauth2Server\controllers\web\Oauth2ServerController;
 use rhertogh\Yii2Oauth2Server\controllers\web\server\base\Oauth2BaseServerAction;
 use rhertogh\Yii2Oauth2Server\helpers\Oauth2RequestHelper;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server\Oauth2RevokeActionInterface;
 use rhertogh\Yii2Oauth2Server\Oauth2Module;
 use Yii;
 use yii\helpers\Json;
@@ -21,7 +22,7 @@
 /**
  * @property Oauth2ServerController $controller
  */
-class Oauth2RevokeAction extends Oauth2BaseServerAction
+class Oauth2RevokeAction extends Oauth2BaseServerAction implements Oauth2RevokeActionInterface
 {
     public function run()
     {

src/controllers/web/wellknown/Oauth2OpenidConfigurationAction.php

@@ -10,14 +10,15 @@
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2CertificatesControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2OidcControllerInterface;
 use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\Oauth2ServerControllerInterface;
+use rhertogh\Yii2Oauth2Server\interfaces\controllers\web\wellknown\Oauth2OpenidConfigurationActionInterface;
 use Yii;
 use yii\helpers\Url;
 use yii\web\ForbiddenHttpException;
 
 /**
  * @property Oauth2WellKnownController $controller
  */
-class Oauth2OpenidConfigurationAction extends Oauth2BaseWebAction
+class Oauth2OpenidConfigurationAction extends Oauth2BaseWebAction implements Oauth2OpenidConfigurationActionInterface
 {
     /**
      *

src/interfaces/controllers/web/certificates/Oauth2JwksActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\certificates;
+
+interface Oauth2JwksActionInterface
+{
+}

src/interfaces/controllers/web/consent/Oauth2AuthorizeClientActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\consent;
+
+interface Oauth2AuthorizeClientActionInterface
+{
+}

src/interfaces/controllers/web/openidconnect/Oauth2OidcEndSessionActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect;
+
+interface Oauth2OidcEndSessionActionInterface
+{
+}

src/interfaces/controllers/web/openidconnect/Oauth2OidcUserinfoActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\openidconnect;
+
+interface Oauth2OidcUserinfoActionInterface
+{
+}

src/interfaces/controllers/web/server/Oauth2AccessTokenActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server;
+
+interface Oauth2AccessTokenActionInterface
+{
+}

src/interfaces/controllers/web/server/Oauth2AuthorizeActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server;
+
+interface Oauth2AuthorizeActionInterface
+{
+}

src/interfaces/controllers/web/server/Oauth2RevokeActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\server;
+
+interface Oauth2RevokeActionInterface
+{
+}

src/interfaces/controllers/web/wellknown/Oauth2OpenidConfigurationActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace rhertogh\Yii2Oauth2Server\interfaces\controllers\web\wellknown;
+
+interface Oauth2OpenidConfigurationActionInterface
+{
+}