[PluginOauth2KeycloakClient] Prepare for 2.x:

- Moved all classes to root folder;

Signed-off-by: Oleksii Bulba <oleksii_bulba@epam.com>

Author: OleksiiBulba

…ation/Provider/ProviderConfiguration.php …ation/Provider/ProviderConfiguration.phpsrc/Configuration/Provider/ProviderConfiguration.php renamed to Configuration/Provider/ProviderConfiguration.php src/Configuration/Provider/ProviderConfiguration.php renamed to Configuration/Provider/ProviderConfiguration.php

@@ -11,10 +11,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak\Configuration\Provider;
+namespace Micro\Plugin\OAuth2\Keycloak\Client\Configuration\Provider;
 
 use Micro\Plugin\OAuth2\Client\Configuration\Provider\OAuth2ClientProviderConfiguration;
-use Micro\Plugin\OAuth2\Client\Keycloak\Provider\KeycloakProviderConfigurationInterface;
+use Micro\Plugin\OAuth2\Keycloak\Client\Provider\KeycloakProviderConfigurationInterface;
 
 /**
  * @author Stanislau Komar <head.trackingsoft@gmail.com>

src/OAuth2KeycloakProviderPlugin.php OAuth2KeycloakProviderPlugin.phpsrc/OAuth2KeycloakProviderPlugin.php renamed to OAuth2KeycloakProviderPlugin.php

@@ -11,16 +11,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak;
+namespace Micro\Plugin\OAuth2\Keycloak\Client;
 
 use League\OAuth2\Client\Provider\AbstractProvider;
-use Micro\Component\DependencyInjection\Container;
-use Micro\Framework\Kernel\Plugin\ConfigurableInterface;
-use Micro\Framework\Kernel\Plugin\DependencyProviderInterface;
-use Micro\Framework\Kernel\Plugin\PluginDependedInterface;
-use Micro\Framework\Kernel\Plugin\PluginConfigurationTrait;
+use Micro\Framework\DependencyInjection\Container;
+use Micro\Framework\BootConfiguration\Plugin\ConfigurableInterface;
+use Micro\Framework\BootDependency\Plugin\DependencyProviderInterface;
+use Micro\Framework\BootConfiguration\Plugin\PluginConfigurationTrait;
 use Micro\Plugin\OAuth2\Client\Configuration\OAuth2ClientPluginConfigurationInterface;
-use Micro\Plugin\OAuth2\Client\Keycloak\Provider\OAuth2Provider;
+use Micro\Plugin\OAuth2\Keycloak\Client\Provider\OAuth2Provider;
 use Micro\Plugin\OAuth2\Client\Provider\OAuth2ClientProviderPluginInterface;
 use Micro\Plugin\Security\Facade\SecurityFacadeInterface;
 

…2KeycloakProviderPluginConfiguration.php …2KeycloakProviderPluginConfiguration.phpsrc/OAuth2KeycloakProviderPluginConfiguration.php renamed to OAuth2KeycloakProviderPluginConfiguration.php src/OAuth2KeycloakProviderPluginConfiguration.php renamed to OAuth2KeycloakProviderPluginConfiguration.php

@@ -11,11 +11,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak;
+namespace Micro\Plugin\OAuth2\Keycloak\Client;
 
 use Micro\Plugin\OAuth2\Client\Configuration\Provider\OAuth2ClientProviderConfigurationInterface;
-use Micro\Plugin\OAuth2\Client\Keycloak\Configuration\Provider\ProviderConfiguration;
 use Micro\Plugin\OAuth2\Client\OAuth2ClientPluginConfiguration;
+use Micro\Plugin\OAuth2\Keycloak\Client\Configuration\Provider\ProviderConfiguration;
 
 /**
  * @author Stanislau Komar <head.trackingsoft@gmail.com>

…ycloakProviderConfigurationInterface.php …ycloakProviderConfigurationInterface.phpsrc/Provider/KeycloakProviderConfigurationInterface.php renamed to Provider/KeycloakProviderConfigurationInterface.php src/Provider/KeycloakProviderConfigurationInterface.php renamed to Provider/KeycloakProviderConfigurationInterface.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak\Provider;
+namespace Micro\Plugin\OAuth2\Keycloak\Client\Provider;
 
 use Micro\Plugin\OAuth2\Client\Configuration\Provider\OAuth2ClientProviderConfigurationInterface;
 

src/Provider/OAuth2Provider.php Provider/OAuth2Provider.phpsrc/Provider/OAuth2Provider.php renamed to Provider/OAuth2Provider.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak\Provider;
+namespace Micro\Plugin\OAuth2\Keycloak\Client\Provider;
 
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
@@ -30,14 +30,13 @@ class OAuth2Provider extends AbstractProvider
     use BearerAuthorizationTrait;
 
     /**
-     * @param OAuth2ClientProviderConfigurationInterface            $providerConfiguration
-     * @param SecurityFacadeInterface                               $securityFacade
+     * @param OAuth2ClientProviderConfigurationInterface $providerConfiguration
+     * @param SecurityFacadeInterface                    $securityFacade
      */
     public function __construct(
-        private readonly OAuth2ClientProviderConfigurationInterface         $providerConfiguration,
-        private readonly SecurityFacadeInterface                            $securityFacade
-    )
-    {
+        private readonly OAuth2ClientProviderConfigurationInterface $providerConfiguration,
+        private readonly SecurityFacadeInterface $securityFacade
+    ) {
         parent::__construct([
             'authServerUrl' =>  $this->providerConfiguration->getUrlAuthorization(),
             'clientId'  =>      $providerConfiguration->getClientId(),

src/Provider/ResourceOwner.php Provider/ResourceOwner.phpsrc/Provider/ResourceOwner.php renamed to Provider/ResourceOwner.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\OAuth2\Client\Keycloak\Provider;
+namespace Micro\Plugin\OAuth2\Keycloak\Client\Provider;
 
 use League\OAuth2\Client\Provider\ResourceOwnerInterface;
 

composer.json

@@ -1,11 +1,11 @@
 {
     "name": "micro/plugin-oauth2-client-keycloak",
     "description": "Micro Framework: Adapter for using Keycloak as an authorization server based on the OAuth2 protocol.",
-    "type": "library",
+    "type": "micro-library",
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "Micro\\Plugin\\OAuth2\\Client\\Keycloak\\": "src/"
+            "Micro\\Plugin\\OAuth2\\Keycloak\\Client\\": "/"
         }
     },
     "authors": [
@@ -15,7 +15,10 @@
         }
     ],
     "require": {
-        "micro/plugin-oauth2-client": "^1",
-        "micro/plugin-security": "^1"
+        "micro/plugin-oauth2-client": "^2.0",
+        "micro/dependency-injection": "^2.0",
+        "micro/kernel-boot-dependency": "^2.0",
+        "micro/kernel-boot-configuration": "^2.0",
+        "micro/plugin-security": "^2.0"
     }
 }