Merge pull request #20 from gerardnll/patch-1

Add nonce attribute in JWT Payload
AzimoLabs · Oct 29, 2021 · 5f09053 · 5f09053
2 parents d31554c + b099cbb
commit 5f09053
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/Auth/Factory/AppleJwtStructFactory.php b/src/Auth/Factory/AppleJwtStructFactory.php
@@ -28,7 +28,8 @@ public function createJwtPayloadFromToken(Token $token): JwtPayload
             // For some reason Apple API returns boolean flag as a string
             (string) $claims->get('is_private_email', 'false') === 'true',
             $claims->get('auth_time'),
-            $claims->get('nonce_supported', false)
+            $claims->get('nonce_supported', false),
+            $claims->get('nonce')
         );
     }
 }
diff --git a/src/Auth/Struct/JwtPayload.php b/src/Auth/Struct/JwtPayload.php
@@ -26,6 +26,8 @@ final class JwtPayload
 
     private int $authTime;
 
+    private ?string $nonce;
+
     private bool $nonceSupported;
 
     public function __construct(
@@ -39,7 +41,8 @@ public function __construct(
         bool $emailVerified,
         bool $isPrivateEmail,
         int $authTime,
-        bool $nonceSupported
+        bool $nonceSupported,
+        ?string $nonce
     ) {
         $this->iss = $iss;
         $this->aud = $aud;
@@ -52,6 +55,7 @@ public function __construct(
         $this->isPrivateEmail = $isPrivateEmail;
         $this->authTime = $authTime;
         $this->nonceSupported = $nonceSupported;
+        $this->nonce = $nonce;
     }
 
     public function getIss(): string
@@ -104,6 +108,11 @@ public function getAuthTime(): int
         return $this->authTime;
     }
 
+    public function getNonce(): ?string
+    {
+        return $this->nonce;
+    }
+
     public function isNonceSupported(): bool
     {
         return $this->nonceSupported;

diff --git a/tests/Unit/Auth/Factory/AppleJwtStructFactoryTest.php b/tests/Unit/Auth/Factory/AppleJwtStructFactoryTest.php
@@ -35,7 +35,8 @@ public function testIfCreateJwtPayloadFromTokenReturnsExpectedJsonPayload(): voi
                 true,
                 true,
                 1591622011,
-                true
+                true,
+                null
             ),
             $this->appleJwtStructFactory->createJwtPayloadFromToken(
                 new Token\Plain(
@@ -57,7 +58,7 @@ public function testIfCreateJwtPayloadFromTokenReturnsExpectedJsonPayload(): voi
                             'email_verified'   => 'true',
                             'is_private_email' => 'true',
                             'auth_time'        => 1591622011,
-                            'nonce_supported'  => true,
+                            'nonce_supported'  => true
                         ], ''
                     ),
                     Token\Signature::fromEmptyData()

diff --git a/tests/Unit/Auth/Service/AppleJwtFetchingServiceTest.php b/tests/Unit/Auth/Service/AppleJwtFetchingServiceTest.php
@@ -115,7 +115,8 @@ public function testIfGetJwtPayloadReturnsExpectedJwtPayloadWhenTokenIsVerifiedA
             true,
             true,
             1591622011,
-            true
+            true,
+            null
         );
 
         $this->factoryMock->shouldReceive('createJwtPayloadFromToken')