✨ Use facade for OAuthClient and change namespaces

Author: JVillator0

README.md

@@ -33,20 +33,20 @@ A package that allows secure communication between two or more projects, focused
     ```php
     protected $routeMiddleware = [
         // Other middleware...
-        'jwt' => \Diimolabs\Oauth2Client\Middleware\EnsureJwtIsValid::class
+        'jwt' => \Diimolabs\OAuth\Middleware\EnsureJwtIsValid::class
     ];
     ```
 
 ## Use
 
 Example of requesting a resource to a microservice
-
 ```php
-use Diimolabs\Oauth2Client\OAuthHttpClient;
+use Diimolabs\OAuth\Facades\OAuthClient;
+use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1')->group(function(){
     Route::get('message', function(){
-        return OAuthHttpClient::oauthRequest()
+        return OAuthClient::request()
             ->get('http://msa-2.test/api/v1/hello-world')
             ->body();
     });
@@ -55,8 +55,9 @@ Route::prefix('v1')->group(function(){
 ```
 
 Example of a request from a microservice client
-
 ```php
+use Illuminate\Support\Facades\Route;
+
 Route::prefix('v1')->middleware('jwt')->group(function ()
 {
     Route::get('/hello-world', function ()
@@ -69,9 +70,7 @@ Route::prefix('v1')->middleware('jwt')->group(function ()
 # Extra
 
 import the configuration file using:
-
 ```
 php artisan vendor:publish --tag=oauth-client
 ```
-
 in `external_services` you can manage the urls of your different services

composer.json

@@ -22,13 +22,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Diimolabs\\Oauth2Client\\": "src/"
+            "Diimolabs\\OAuth\\": "src/"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Diimolabs\\Oauth2Client\\OAuthServiceProvider"
+                "Diimolabs\\OAuth\\OAuthServiceProvider"
             ]
         }
     }

src/Facades/OAuthClient.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Diimolabs\OAuth\Facades;
+
+use Diimolabs\OAuth\OAuthHttpClient;
+use Illuminate\Support\Facades\Facade;
+
+class OAuthClient extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return OAuthHttpClient::class;
+    }
+}

src/OAuthHttpClient.php

@@ -1,34 +1,34 @@
 <?php
 
-namespace Diimolabs\Oauth2Client;
+namespace Diimolabs\OAuth;
 
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 
 class OAuthHttpClient
 {
-    private static $path;
+    private $path;
 
-    private static $host;
+    private $host;
 
-    private static $clientId;
+    private $clientId;
 
-    private static $clientSecret;
+    private $clientSecret;
 
-    private static function getCredentialsInfo()
+    private function getCredentialsInfo()
     {
         return collect(json_decode(
-            file_get_contents(self::$path)
+            file_get_contents($this->path)
         ));
     }
 
-    private static function requestToken()
+    private function requestToken()
     {
         $response = Http::acceptJson()
-            ->post(self::$host . '/oauth/token', [
+            ->post($this->host . '/oauth/token', [
                 'grant_type' => 'client_credentials',
-                'client_id' => self::$clientId,
-                'client_secret' => self::$clientSecret,
+                'client_id' => $this->clientId,
+                'client_secret' => $this->clientSecret,
             ]);
 
         if ($response->failed()) {
@@ -38,44 +38,44 @@ private static function requestToken()
         Storage::put('oauth-credentials.json.key', $response->body());
     }
 
-    private static function validateToken()
+    private function validateToken()
     {
-        if (! file_exists(self::$path)) {
-            self::requestToken();
+        if (! file_exists($this->path)) {
+            $this->requestToken();
         }
 
-        $data = self::getCredentialsInfo();
+        $data = $this->getCredentialsInfo();
 
         $expiredDate = now()->parse(date("Y-m-d H:i:s", $data['expires_in']));
 
         if (now()->lt($expiredDate)) {
-            self::requestToken();
+            $this->requestToken();
         }
     }
 
-    private static function getAuthorizationToken()
+    private function getAuthorizationToken()
     {
-        self::validateToken();
+        $this->validateToken();
 
-        return self::getCredentialsInfo()['access_token'];
+        return $this->getCredentialsInfo()['access_token'];
     }
 
-    private static function getOauthAuthorization()
+    private function getOauthAuthorization()
     {
         return [
-            'Authorization' => 'Bearer ' . self::getAuthorizationToken()
+            'Authorization' => 'Bearer ' . $this->getAuthorizationToken()
         ];
     }
 
-    public static function oauthRequest()
+    public function request()
     {
-        self::$path = storage_path('app/oauth-credentials.json.key');
-        self::$host = config('oauth-client.host');
-        self::$clientId = config('oauth-client.client_id');
-        self::$clientSecret = config('oauth-client.client_secret');
+        $this->path = storage_path('app/oauth-credentials.json.key');
+        $this->host = config('oauth-client.host');
+        $this->clientId = config('oauth-client.client_id');
+        $this->clientSecret = config('oauth-client.client_secret');
 
         return Http::withHeaders(
-            self::getOauthAuthorization()
+            $this->getOauthAuthorization()
         );
     }
 }

src/OAuthServiceProvider.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Diimolabs\Oauth2Client;
+namespace Diimolabs\OAuth;
 
-use Diimolabs\Oauth2Client\OAuthHttpClient;
+use Diimolabs\OAuth\Facades\OAuthClient;
 use Illuminate\Support\ServiceProvider;
 
 class OAuthServiceProvider extends ServiceProvider
@@ -16,8 +16,8 @@ public function boot()
 
     public function register()
     {
-        $this->app->singleton(OAuthHttpClient::class, function(){
-            return new OAuthHttpClient();
+        $this->app->bind(OAuthClient::class, function(){
+            return new OAuthClient;
         });
     }
 }