Skip to content

Commit e7519e8

Browse files
wip
1 parent cb1fd11 commit e7519e8

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

src/Http/Middleware/SignCloudfrontCookies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function handle(Request $request, Closure $next)
2323

2424
$guards = Config::getGuards();
2525
$isAuthenticated = collect($guards)
26-
->contains(fn (string $guard) => (
26+
->contains(fn (?string $guard) => (
2727
auth($guard)->check()
2828
));
2929

src/Support/Config.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,16 @@ public static function getCookieDuration(): int
101101
return (int) self::getExpirationInterval()->totalMinutes;
102102
}
103103

104-
public static function getGuards(): ?array
104+
public static function getGuards(): array
105105
{
106-
$gurads = config('cloudfront-cookies.guards');
106+
$guards = config('cloudfront-cookies.guards');
107107

108-
if (blank($gurads)) {
109-
return null;
108+
if (blank($guards)) {
109+
return [null];
110110
}
111111

112-
if (is_string($gurads) || is_array($gurads)) {
113-
return Arr::wrap($gurads);
112+
if (is_string($guards) || is_array($guards)) {
113+
return Arr::wrap($guards);
114114
}
115115

116116
throw new InvalidArgumentException;

tests/ExampleTest.php

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/MiddlewareTest.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
it('uses custom guard when configured', function () {
8181
config()->set('cloudfront-cookies.enabled', true);
82-
config()->set('cloudfront-cookies.guard', 'api');
82+
config()->set('cloudfront-cookies.guards', ['api']);
8383

8484
Auth::shouldReceive('guard')
8585
->with('api')
@@ -122,14 +122,20 @@
122122
});
123123
});
124124

125-
describe('Config getGuard', function () {
126-
it('returns null when not configured', function () {
127-
expect(Config::getGuard())->toBeNull();
125+
describe('Config getGuards', function () {
126+
it('returns array with null when not configured', function () {
127+
expect(Config::getGuards())->toBe([null]);
128128
});
129129

130-
it('returns configured guard', function () {
131-
config()->set('cloudfront-cookies.guard', 'api');
130+
it('returns configured guards as array', function () {
131+
config()->set('cloudfront-cookies.guards', ['api']);
132132

133-
expect(Config::getGuard())->toBe('api');
133+
expect(Config::getGuards())->toBe(['api']);
134+
});
135+
136+
it('wraps string guard into array', function () {
137+
config()->set('cloudfront-cookies.guards', 'api');
138+
139+
expect(Config::getGuards())->toBe(['api']);
134140
});
135141
});

0 commit comments

Comments
 (0)