remove some un-neccessary code

ziming · Dec 8, 2024 · abbca9b · abbca9b
1 parent d8ed664
commit abbca9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/LaravelMyinfoSg.php b/src/LaravelMyinfoSg.php
@@ -134,19 +134,18 @@ private function createTokenRequest(
             }
         }
 
-        $response = $guzzleClient->post(config('laravel-myinfo-sg.api_token_url'), [
+        return $guzzleClient->post(config('laravel-myinfo-sg.api_token_url'), [
             'form_params' => $params,
             'headers' => $headers,
         ]);
-
-        return $response;
     }
 
     /**
      * Call Person API.
      *
      * @return array<string, mixed>|array<string, array>
      * @throws GuzzleException
+     * @throws Exception
      */
     private function callPersonAPI(
         #[\SensitiveParameter]

diff --git a/src/Services/MyinfoSecurityService.php b/src/Services/MyinfoSecurityService.php
@@ -143,7 +143,7 @@ public static function decryptJWE(
         string $personDataToken,
         #[\SensitiveParameter]
         string $passphrase = null
-    ): array|string
+    ): ?string
     {
         // $passphrase is by default null for backward compatibility purpose as I want to avoid a major version bump
         $passphrase = ($passphrase === null) ? config('laravel-myinfo-sg.client_secret') : $passphrase;
@@ -179,6 +179,10 @@ public static function decryptJWE(
 
         $payload = $jwe->getPayload();
 
+        if ($payload === null) {
+            return null;
+        }
+
         return str_replace('"', '', $payload);
     }
 }