Tests: Updated comment test to account for new editor usage

[bookstack] / tests / Unit / OidcIdTokenTest.php

diff --git a/tests/Unit/OidcIdTokenTest.php b/tests/Unit/OidcIdTokenTest.php
index b08d578b3b954c8b2d8bc4cc920c7bacac64971b..739323266942be0f4e8d7e3473699a6ddb42cd19 100644 (file)
--- a/tests/Unit/OidcIdTokenTest.php
+++ b/tests/Unit/OidcIdTokenTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
 
 namespace Tests\Unit;
 

-use BookStack\Auth\Access\Oidc\OidcInvalidTokenException;
-use BookStack\Auth\Access\Oidc\OidcIdToken;
+use BookStack\Access\Oidc\OidcIdToken;
+use BookStack\Access\Oidc\OidcInvalidTokenException;

 use Tests\Helpers\OidcJwtHelper;
 use Tests\TestCase;
 
 use Tests\Helpers\OidcJwtHelper;
 use Tests\TestCase;
 


@@ -12,7 +12,7 @@ class OidcIdTokenTest extends TestCase
     public function test_valid_token_passes_validation()
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [
     public function test_valid_token_passes_validation()
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [

-            OidcJwtHelper::publicJwkKeyArray()
+            OidcJwtHelper::publicJwkKeyArray(),

         ]);
 
         $this->assertTrue($token->validate('xxyyzz.aaa.bbccdd.123'));
         ]);
 
         $this->assertTrue($token->validate('xxyyzz.aaa.bbccdd.123'));


@@ -54,6 +54,7 @@ class OidcIdTokenTest extends TestCase
         foreach ($messagesAndTokenValues as [$message, $tokenValue]) {
             $token = new OidcIdToken($tokenValue, OidcJwtHelper::defaultIssuer(), []);
             $err = null;
         foreach ($messagesAndTokenValues as [$message, $tokenValue]) {
             $token = new OidcIdToken($tokenValue, OidcJwtHelper::defaultIssuer(), []);
             $err = null;

+

             try {
                 $token->validate('abc');
             } catch (\Exception $exception) {
             try {
                 $token->validate('abc');
             } catch (\Exception $exception) {


@@ -77,8 +78,8 @@ class OidcIdTokenTest extends TestCase
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [
             array_merge(OidcJwtHelper::publicJwkKeyArray(), [
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [
             array_merge(OidcJwtHelper::publicJwkKeyArray(), [

-                'n' => 'iqK-1QkICMf_cusNLpeNnN-bhT0-9WLBvzgwKLALRbrevhdi5ttrLHIQshaSL0DklzfyG2HWRmAnJ9Q7sweEjuRiiqRcSUZbYu8cIv2hLWYu7K_NH67D2WUjl0EnoHEuiVLsZhQe1CmdyLdx087j5nWkd64K49kXRSdxFQUlj8W3NeK3CjMEUdRQ3H4RZzJ4b7uuMiFA29S2ZhMNG20NPbkUVsFL-jiwTd10KSsPT8yBYipI9O7mWsUWt_8KZs1y_vpM_k3SyYihnWpssdzDm1uOZ8U3mzFr1xsLAO718GNUSXk6npSDzLl59HEqa6zs4O9awO2qnSHvcmyELNk31w'
-            ])
+                'n' => 'iqK-1QkICMf_cusNLpeNnN-bhT0-9WLBvzgwKLALRbrevhdi5ttrLHIQshaSL0DklzfyG2HWRmAnJ9Q7sweEjuRiiqRcSUZbYu8cIv2hLWYu7K_NH67D2WUjl0EnoHEuiVLsZhQe1CmdyLdx087j5nWkd64K49kXRSdxFQUlj8W3NeK3CjMEUdRQ3H4RZzJ4b7uuMiFA29S2ZhMNG20NPbkUVsFL-jiwTd10KSsPT8yBYipI9O7mWsUWt_8KZs1y_vpM_k3SyYihnWpssdzDm1uOZ8U3mzFr1xsLAO718GNUSXk6npSDzLl59HEqa6zs4O9awO2qnSHvcmyELNk31w',
+            ]),

         ]);
         $this->expectException(OidcInvalidTokenException::class);
         $this->expectExceptionMessage('Token signature could not be validated using the provided keys');
         ]);
         $this->expectException(OidcInvalidTokenException::class);
         $this->expectExceptionMessage('Token signature could not be validated using the provided keys');


@@ -97,7 +98,7 @@ class OidcIdTokenTest extends TestCase
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken([], ['alg' => 'HS256']), OidcJwtHelper::defaultIssuer(), []);
         $this->expectException(OidcInvalidTokenException::class);
     {
         $token = new OidcIdToken(OidcJwtHelper::idToken([], ['alg' => 'HS256']), OidcJwtHelper::defaultIssuer(), []);
         $this->expectException(OidcInvalidTokenException::class);

-        $this->expectExceptionMessage("Only RS256 signature validation is supported. Token reports using HS256");
+        $this->expectExceptionMessage('Only RS256 signature validation is supported. Token reports using HS256');

         $token->validate('abc');
     }
 
         $token->validate('abc');
     }
 


@@ -112,7 +113,7 @@ class OidcIdTokenTest extends TestCase
             // 2. aud claim present
             ['Missing token audience value', ['aud' => null]],
             // 2. aud claim validates all values against those expected (Only expect single)
             // 2. aud claim present
             ['Missing token audience value', ['aud' => null]],
             // 2. aud claim validates all values against those expected (Only expect single)

-            ['Token audience value has 2 values, Expected 1', ['aud' => ['abc', 'def']]],
+            ['Token audience value has 2 values, Expected 1', ['aud' => ['xxyyzz.aaa.bbccdd.123', 'def']]],

             // 2. aud claim matches client id
             ['Token audience value did not match the expected client_id', ['aud' => 'xxyyzz.aaa.bbccdd.456']],
             // 4. azp claim matches client id if present
             // 2. aud claim matches client id
             ['Token audience value did not match the expected client_id', ['aud' => 'xxyyzz.aaa.bbccdd.456']],
             // 4. azp claim matches client id if present


@@ -134,10 +135,11 @@ class OidcIdTokenTest extends TestCase
 
         foreach ($claimOverridesByErrorMessage as [$message, $overrides]) {
             $token = new OidcIdToken(OidcJwtHelper::idToken($overrides), OidcJwtHelper::defaultIssuer(), [
 
         foreach ($claimOverridesByErrorMessage as [$message, $overrides]) {
             $token = new OidcIdToken(OidcJwtHelper::idToken($overrides), OidcJwtHelper::defaultIssuer(), [

-                OidcJwtHelper::publicJwkKeyArray()
+                OidcJwtHelper::publicJwkKeyArray(),

             ]);
 
             $err = null;
             ]);
 
             $err = null;

+

             try {
                 $token->validate('xxyyzz.aaa.bbccdd.123');
             } catch (\Exception $exception) {
             try {
                 $token->validate('xxyyzz.aaa.bbccdd.123');
             } catch (\Exception $exception) {


@@ -155,10 +157,10 @@ class OidcIdTokenTest extends TestCase
         $testFilePath = 'file://' . stream_get_meta_data($file)['uri'];
         file_put_contents($testFilePath, OidcJwtHelper::publicPemKey());
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [
         $testFilePath = 'file://' . stream_get_meta_data($file)['uri'];
         file_put_contents($testFilePath, OidcJwtHelper::publicPemKey());
         $token = new OidcIdToken(OidcJwtHelper::idToken(), OidcJwtHelper::defaultIssuer(), [

-            $testFilePath
+            $testFilePath,

         ]);
 
         $this->assertTrue($token->validate('xxyyzz.aaa.bbccdd.123'));
         unlink($testFilePath);
     }
         ]);
 
         $this->assertTrue($token->validate('xxyyzz.aaa.bbccdd.123'));
         unlink($testFilePath);
     }

-}
\ No newline at end of file
+}