feat: GoogleUser -> Claims

yumemi-inc · May 26, 2023 · 6f387f9 · 6f387f9
1 parent be427d1
commit 6f387f9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/GoogleUser.php → src/Claims.php b/src/GoogleUser.php → src/Claims.php
@@ -7,7 +7,7 @@
 use YumemiInc\GoogleIapLaravel\Internal\Assert;
 use YumemiInc\GoogleIapLaravel\Internal\AssertionException;
 
-class GoogleUser
+class Claims
 {
     /**
      * @var array{

diff --git a/src/DefaultGoogleUserResolver.php b/src/DefaultGoogleUserResolver.php
@@ -9,7 +9,7 @@
 
 class DefaultGoogleUserResolver implements GoogleUserResolver
 {
-    public function provide(GoogleUser $googleUser, UserProvider $userProvider): ?Authenticatable
+    public function provide(Claims $googleUser, UserProvider $userProvider): ?Authenticatable
     {
         return $userProvider->retrieveById($googleUser->sub());
     }

diff --git a/src/GoogleIdTokenVerifier.php b/src/GoogleIdTokenVerifier.php
@@ -22,11 +22,11 @@ public function __construct(
     /**
      * Verifies the JWT issued by Google IAP.
      *
-     * @return null|GoogleUser claims in the JWT, or null if the token is invalid or malformed
+     * @return null|Claims claims in the JWT, or null if the token is invalid or malformed
      *
      * @throws MalformedClaimsException
      */
-    public function verify(string $jwt): ?GoogleUser
+    public function verify(string $jwt): ?Claims
     {
         if (!($claims = (new AccessToken())->verify($jwt, [
             'certsLocation' => $this->jwksUrl,
@@ -35,7 +35,7 @@ public function verify(string $jwt): ?GoogleUser
             return null;
         }
 
-        $googleUser = new GoogleUser($claims);
+        $googleUser = new Claims($claims);
 
         if ($this->issuer !== null && $googleUser->iss() !== $this->issuer) {
             // Issuer verification failed.

diff --git a/src/GoogleUserResolver.php b/src/GoogleUserResolver.php
@@ -9,5 +9,5 @@
 
 interface GoogleUserResolver
 {
-    public function provide(GoogleUser $googleUser, UserProvider $userProvider): ?Authenticatable;
+    public function provide(Claims $googleUser, UserProvider $userProvider): ?Authenticatable;
 }
diff --git a/src/Http/GoogleIapGuard.php b/src/Http/GoogleIapGuard.php
@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Http\Request;
+use YumemiInc\GoogleIapLaravel\Claims;
 use YumemiInc\GoogleIapLaravel\DefaultGoogleUserResolver;
 use YumemiInc\GoogleIapLaravel\GoogleIdTokenVerifier;
 use YumemiInc\GoogleIapLaravel\GoogleUserResolver;
@@ -34,12 +35,12 @@ public function callback(): ?Authenticatable
             return null;
         }
 
-        if (($googleUser = $this->googleIdTokenVerifier->verify($jwt)) === null) {
+        if (!($claims = $this->googleIdTokenVerifier->verify($jwt)) instanceof Claims) {
             return null;
         }
 
         return $this->userProviderAdapter->provide(
-            $googleUser,
+            $claims,
             $this->provider,
         );
     }