Skip to content

Commit b3c549d

Browse files
hafezdivandariziming
hafezdivandari
and
ziming
authored
[13.x] Allow firebase/php-jwt v7 (#1879)
* Allow firebase/php-jwt 7 too * fix tests --------- Co-authored-by: ziming <[email protected]>
1 parent ee138cb commit b3c549d

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"php": "^8.2",
1818
"ext-json": "*",
1919
"ext-openssl": "*",
20-
"firebase/php-jwt": "^6.4",
20+
"firebase/php-jwt": "^6.4|^7.0",
2121
"illuminate/auth": "^11.35|^12.0",
2222
"illuminate/console": "^11.35|^12.0",
2323
"illuminate/container": "^11.35|^12.0",

‎tests/Unit/ApiTokenCookieFactoryTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function test_cookie_can_be_successfully_created()
2626
'secure' => true,
2727
'same_site' => 'lax',
2828
]);
29-
$encrypter = new Encrypter(str_repeat('a', 16));
29+
$encrypter = new Encrypter(str_repeat('a', 32), 'aes-256-cbc');
3030
$factory = new ApiTokenCookieFactory($config, $encrypter);
3131

3232
$cookie = $factory->make(1, 'token');
@@ -48,7 +48,7 @@ public function test_cookie_can_be_successfully_created_when_using_a_custom_encr
4848
'secure' => true,
4949
'same_site' => 'lax',
5050
]);
51-
$encrypter = new Encrypter(str_repeat('a', 16));
51+
$encrypter = new Encrypter(str_repeat('a', 32), 'aes-256-cbc');
5252
$factory = new ApiTokenCookieFactory($config, $encrypter);
5353

5454
$cookie = $factory->make(1, 'token');

‎tests/Unit/TokenGuardTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function test_users_may_be_retrieved_from_cookies_with_csrf_token_header(
159159
$resourceServer = m::mock(ResourceServer::class);
160160
$userProvider = m::mock(PassportUserProvider::class);
161161
$clients = m::mock(ClientRepository::class);
162-
$encrypter = new Encrypter(str_repeat('a', 16));
162+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
163163

164164
$clients->shouldReceive('findActive')
165165
->with(1)
@@ -173,7 +173,7 @@ public function test_users_may_be_retrieved_from_cookies_with_csrf_token_header(
173173
'aud' => 1,
174174
'csrf' => 'token',
175175
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
176-
], str_repeat('a', 16), 'HS256'), false)
176+
], $key, 'HS256'), false)
177177
);
178178

179179
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -191,7 +191,7 @@ public function test_users_may_be_retrieved_from_cookies_with_xsrf_token_header(
191191
$resourceServer = m::mock(ResourceServer::class);
192192
$userProvider = m::mock(PassportUserProvider::class);
193193
$clients = m::mock(ClientRepository::class);
194-
$encrypter = new Encrypter(str_repeat('a', 16));
194+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
195195

196196
$clients->shouldReceive('findActive')
197197
->with(1)
@@ -205,7 +205,7 @@ public function test_users_may_be_retrieved_from_cookies_with_xsrf_token_header(
205205
'aud' => 1,
206206
'csrf' => 'token',
207207
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
208-
], str_repeat('a', 16), 'HS256'), false)
208+
], $key, 'HS256'), false)
209209
);
210210

211211
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -223,7 +223,7 @@ public function test_cookie_xsrf_is_verified_against_csrf_token_header()
223223
$resourceServer = m::mock(ResourceServer::class);
224224
$userProvider = m::mock(PassportUserProvider::class);
225225
$clients = m::mock(ClientRepository::class);
226-
$encrypter = new Encrypter(str_repeat('a', 16));
226+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
227227

228228
$request = Request::create('/');
229229
$request->headers->set('X-CSRF-TOKEN', 'wrong_token');
@@ -233,7 +233,7 @@ public function test_cookie_xsrf_is_verified_against_csrf_token_header()
233233
'aud' => 1,
234234
'csrf' => 'token',
235235
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
236-
], str_repeat('a', 16), 'HS256'))
236+
], $key, 'HS256'))
237237
);
238238

239239
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -248,7 +248,7 @@ public function test_cookie_xsrf_is_verified_against_xsrf_token_header()
248248
$resourceServer = m::mock(ResourceServer::class);
249249
$userProvider = m::mock(PassportUserProvider::class);
250250
$clients = m::mock(ClientRepository::class);
251-
$encrypter = new Encrypter(str_repeat('a', 16));
251+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
252252

253253
$request = Request::create('/');
254254
$request->headers->set('X-XSRF-TOKEN', $encrypter->encrypt('wrong_token', false));
@@ -258,7 +258,7 @@ public function test_cookie_xsrf_is_verified_against_xsrf_token_header()
258258
'aud' => 1,
259259
'csrf' => 'token',
260260
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
261-
], str_repeat('a', 16), 'HS256'))
261+
], $key, 'HS256'))
262262
);
263263

264264
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -277,7 +277,7 @@ public function test_users_may_be_retrieved_from_cookies_with_xsrf_token_header_
277277
$resourceServer = m::mock(ResourceServer::class);
278278
$userProvider = m::mock(PassportUserProvider::class);
279279
$clients = m::mock(ClientRepository::class);
280-
$encrypter = new Encrypter(str_repeat('a', 16));
280+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
281281

282282
$clients->shouldReceive('findActive')
283283
->with(1)
@@ -317,7 +317,7 @@ public function test_users_may_be_retrieved_from_cookies_without_encryption()
317317
$resourceServer = m::mock(ResourceServer::class);
318318
$userProvider = m::mock(PassportUserProvider::class);
319319
$clients = m::mock(ClientRepository::class);
320-
$encrypter = new Encrypter(str_repeat('a', 16));
320+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
321321

322322
$clients->shouldReceive('findActive')
323323
->with(1)
@@ -353,7 +353,7 @@ public function test_xsrf_token_cookie_without_a_token_header_is_not_accepted()
353353
$resourceServer = m::mock(ResourceServer::class);
354354
$userProvider = m::mock(PassportUserProvider::class);
355355
$clients = m::mock(ClientRepository::class);
356-
$encrypter = new Encrypter(str_repeat('a', 16));
356+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
357357

358358
$request = Request::create('/');
359359
$request->cookies->set('XSRF-TOKEN', $encrypter->encrypt('token', false));
@@ -363,7 +363,7 @@ public function test_xsrf_token_cookie_without_a_token_header_is_not_accepted()
363363
'aud' => 1,
364364
'csrf' => 'token',
365365
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
366-
], str_repeat('a', 16), 'HS256'))
366+
], $key, 'HS256'))
367367
);
368368

369369
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -378,7 +378,7 @@ public function test_expired_cookies_may_not_be_used()
378378
$resourceServer = m::mock(ResourceServer::class);
379379
$userProvider = m::mock(PassportUserProvider::class);
380380
$clients = m::mock(ClientRepository::class);
381-
$encrypter = new Encrypter(str_repeat('a', 16));
381+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
382382

383383
$request = Request::create('/');
384384
$request->headers->set('X-CSRF-TOKEN', 'token');
@@ -388,7 +388,7 @@ public function test_expired_cookies_may_not_be_used()
388388
'aud' => 1,
389389
'csrf' => 'token',
390390
'exp' => Carbon::now()->subMinutes(10)->getTimestamp(),
391-
], str_repeat('a', 16), 'HS256'))
391+
], $key, 'HS256'))
392392
);
393393

394394
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -403,7 +403,7 @@ public function test_csrf_check_can_be_disabled()
403403
$resourceServer = m::mock(ResourceServer::class);
404404
$userProvider = m::mock(PassportUserProvider::class);
405405
$clients = m::mock(ClientRepository::class);
406-
$encrypter = new Encrypter(str_repeat('a', 16));
406+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
407407

408408
$clients->shouldReceive('findActive')
409409
->with(1)
@@ -417,7 +417,7 @@ public function test_csrf_check_can_be_disabled()
417417
'sub' => 1,
418418
'aud' => 1,
419419
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
420-
], str_repeat('a', 16), 'HS256'), false)
420+
], $key, 'HS256'), false)
421421
);
422422

423423
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);
@@ -528,7 +528,7 @@ public function test_clients_may_be_retrieved_from_cookies()
528528
$resourceServer = m::mock(ResourceServer::class);
529529
$userProvider = m::mock(PassportUserProvider::class);
530530
$clients = m::mock(ClientRepository::class);
531-
$encrypter = new Encrypter(str_repeat('a', 16));
531+
$encrypter = new Encrypter($key = str_repeat('a', 32), 'aes-256-cbc');
532532

533533
$request = Request::create('/');
534534
$request->headers->set('X-CSRF-TOKEN', 'token');
@@ -538,7 +538,7 @@ public function test_clients_may_be_retrieved_from_cookies()
538538
'aud' => 1,
539539
'csrf' => 'token',
540540
'exp' => Carbon::now()->addMinutes(10)->getTimestamp(),
541-
], str_repeat('a', 16), 'HS256'), false)
541+
], $key, 'HS256'), false)
542542
);
543543

544544
$guard = new TokenGuard($resourceServer, $userProvider, $clients, $encrypter, $request);

0 commit comments

Comments
 (0)