Merge pull request #4 from achmadhadikurnia/main

Fix Token bugs
kanekescom · Sep 18, 2023 · 85ee601 · 85ee601
2 parents 712500c + 2aaae07
commit 85ee601
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -46,6 +46,9 @@
             "aliases": {
                 "Siasn": "Kanekescom\\Siasn\\Api\\Facades\\Siasn"
             }
+        },
+        "branch-alias": {
+            "dev-main": "dev-main"
         }
     },
     "scripts": {

diff --git a/src/Commands/GetData.php b/src/Commands/GetData.php
@@ -3,7 +3,7 @@
 namespace Kanekescom\Siasn\Api\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
+use Kanekescom\Siasn\Api\Facades\Siasn;
 
 class GetData extends Command
 {
@@ -27,6 +27,6 @@ class GetData extends Command
      */
     public function handle()
     {
-        $this->info(json_encode(Http::siasn()->get($this->argument('endpoint'))->object(), JSON_PRETTY_PRINT));
+        $this->info(json_encode(Siasn::get($this->argument('endpoint'))->object(), JSON_PRETTY_PRINT));
     }
 }
diff --git a/src/Credentials/Token.php b/src/Credentials/Token.php
@@ -2,6 +2,8 @@
 
 namespace Kanekescom\Siasn\Api\Credentials;
 
+use Kanekescom\Siasn\Api\Exceptions\InvalidSsoCredentialsException;
+use Kanekescom\Siasn\Api\Exceptions\InvalidWsCredentialsException;
 use Kanekescom\Siasn\Api\SiasnConfig;
 
 class Token
@@ -12,7 +14,13 @@ class Token
     public static function getSsoToken()
     {
         return cache()->remember('sso-token', SiasnConfig::getSsoTokenAge(), function () {
-            return Sso::getToken()->object();
+            $ssoToken = Sso::getToken()->object();
+
+            if (blank(optional($ssoToken)->token_type) || blank(optional($ssoToken)->access_token)) {
+                throw new InvalidSsoCredentialsException('Invalid SSO user credentials.');
+            }
+
+            return $ssoToken;
         });
     }
 
@@ -22,7 +30,13 @@ public static function getSsoToken()
     public static function getWsToken()
     {
         return cache()->remember('ws-token', SiasnConfig::getWsTokenAge(), function () {
-            return Ws::getToken()->object();
+            $wsToken = Ws::getToken()->object();
+
+            if (blank(optional($wsToken)->access_token)) {
+                throw new InvalidWsCredentialsException('Invalid WS user credentials.');
+            }
+
+            return $wsToken;
         });
     }
 }
diff --git a/src/Exceptions/InvalidCredentialsException.php b/src/Exceptions/InvalidCredentialsException.php
diff --git a/src/Siasn.php b/src/Siasn.php
@@ -11,8 +11,8 @@ class Siasn
 
     public function __construct()
     {
-        $wsToken = Token::getWsToken();
         $ssoToken = Token::getSsoToken();
+        $wsToken = Token::getWsToken();
 
         $this->request = Http::retry(3, 100)
             ->withOptions([

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -65,4 +65,10 @@ public function can_forget_token()
         $this->assertNull(cache('sso-token'));
         $this->assertNull(cache('ws-token'));
     }
+
+    /** @test */
+    public function can_get_data()
+    {
+        $this->artisan('siasn:get '.env('SIASN_GET_ENDPOINT_TEST'))->assertSuccessful();
+    }
 }