Skip to content

Commit 1310db2

Browse files
authored
Merge pull request #40 from cesargb/bug_cookie
fix: cookie can return an array or string
2 parents 14b14a6 + fe33b12 commit 1310db2

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/Middlewares/MagiclinkMiddleware.php

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Closure;
66
use Illuminate\Contracts\Encryption\DecryptException;
77
use Illuminate\Http\Request;
8-
use Illuminate\Support\Facades\Hash;
8+
use Illuminate\Support\Arr;
99
use MagicLink\MagicLink;
1010
use MagicLink\Responses\Response;
1111

@@ -35,7 +35,9 @@ public function handle(Request $request, Closure $next)
3535
}
3636

3737
try {
38-
$accessCode = decrypt($request->cookie('magic-link-access-code'));
38+
$cookie = Arr::last((array) $request->cookie('magic-link-access-code'));
39+
40+
$accessCode = decrypt($cookie);
3941

4042
// Validate access_code
4143
if ($magicLink->checkAccessCode($accessCode)) {
@@ -55,17 +57,6 @@ public function handle(Request $request, Closure $next)
5557
return $next($request);
5658
}
5759

58-
// private function isAccessCodeValid(string $token, ?string $accessCode): bool
59-
// {
60-
// if ($accessCode === null) {
61-
// return false;
62-
// }
63-
64-
// $magicLink = MagicLink::getValidMagicLinkByToken($token);
65-
66-
// return Hash::check($accessCode, $magicLink->access_code);
67-
// }
68-
6960
protected function badResponse()
7061
{
7162
$responseClass = config('magiclink.invalid_response.class', Response::class);

0 commit comments

Comments
 (0)