Add more tests

pelmered · Sep 16, 2024 · a00e1e8 · a00e1e8
1 parent 2339f15
commit a00e1e8
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 10 deletions.
diff --git a/src/AccessToken.php b/src/AccessToken.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Client\PendingRequest;
+use Illuminate\Http\Client\Response;
 use InvalidArgumentException;
 
 final class AccessToken
@@ -63,7 +64,7 @@ public function getHttpClient(PendingRequest $httpClient): PendingRequest
             self::TOKEN_TYPE_BEARER => $httpClient->withToken($this->accessToken),
             self::TOKEN_TYPE_QUERY  => $httpClient->withQueryParameters([$this->tokenName => $this->accessToken]),
             self::TOKEN_TYPE_CUSTOM => $this->resolveCustomAuth($httpClient),
-            default           => throw new InvalidArgumentException('Invalid auth type')
+            default                 => throw new InvalidArgumentException('Invalid auth type')
         };
     }
 
@@ -75,4 +76,27 @@ protected function resolveCustomAuth(PendingRequest $httpClient): PendingRequest
 
         return ($this->customCallback)($httpClient);
     }
+
+    public static function parseQueryTokenFromResponse(Response $response, string $queryKey = 'token'): ?string
+    {
+        $uri = $response->effectiveUri();
+
+        if (! $uri) {
+            return null;
+        }
+
+        return self::parseTokenFromQueryString($response->effectiveUri()?->getQuery(), $queryKey);
+    }
+
+    public static function parseQueryTokenFromUrl(string $url, string $queryKey = 'token'): string
+    {
+        return self::parseTokenFromQueryString(parse_url($url, PHP_URL_QUERY), $queryKey);
+    }
+
+    public static function parseTokenFromQueryString(string $queryString, string $queryKey = 'token'): string
+    {
+        parse_str($queryString, $output);
+
+        return $output[$queryKey];
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
+use Pelmered\LaravelHttpOAuthHelper\AccessToken;
 use Pelmered\LaravelHttpOAuthHelper\LaravelHttpOAuthHelperServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
@@ -17,7 +18,7 @@ protected function setUp(): void
         Http::preventStrayRequests();
 
         Http::fake(
-            static function (Request $request) {
+             function (Request $request) {
                 if ($request->url() === 'https://example.com/oauth/token') {
                     if ($request->token = 'my_refresh_token') {
                         return Http::response([
@@ -49,10 +50,7 @@ static function (Request $request) {
                 }
 
                 if (Str::of($request->url())->startsWith('https://example.com/api?token=')) {
-
-                    $url = parse_url($request->url(), PHP_URL_QUERY);
-                    parse_str($url, $output);
-                    $token = $output['token'];
+                    $token = AccessToken::parseQueryTokenFromUrl($request->url());
 
                     return Http::response([
                         'data'  => 'some data with query string token',
@@ -63,8 +61,6 @@ static function (Request $request) {
                 return Http::response([], 200);
             }
         );
-
-        //Cache::spy();
     }
 
     protected function defineEnvironment($app)

diff --git a/tests/Unit/ArchTest.php b/tests/Unit/ArchTest.php
@@ -1,6 +1,6 @@
 <?php
 
 arch()->preset()->laravel();
-arch()->preset()->security();
+arch()->preset()->security()->ignoring('parse_str');;
 
 arch()->expect('dd')->not->toBeUsed();
diff --git a/tests/Unit/RefreshTokenTest.php b/tests/Unit/RefreshTokenTest.php
@@ -6,6 +6,7 @@
 use Illuminate\Http\Client\Factory;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Request;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Pelmered\LaravelHttpOAuthHelper\AccessToken;
@@ -262,7 +263,7 @@
             ->and($accessToken->getCustomCallback())->toBeNull();
     });
 
-    test('token type custom', function () {
+    test('custom token type', function () {
 
         $accessToken = app(RefreshToken::class)(
             'https://example.com/oauth/token',
@@ -285,4 +286,45 @@
         expect($options['headers']['MyCustomAuthHeader'])->toBe('my_custom_token');
     });
 
+    test('custom auth token type', function () {
+
+        app(RefreshToken::class)(
+            'https://example.com/oauth/token',
+            new Credentials(function (PendingRequest $httpClient) {
+                return $httpClient->withHeader('MyCustomAuthHeader', 'my_custom_token');
+            }),
+            new Options(
+                scopes: ['scope1', 'scope2'],
+            ),
+        );
+        Http::assertSent(static function (Request $request) {
+            return $request->hasHeader('MyCustomAuthHeader', 'my_custom_token')
+                   && $request->url() === 'https://example.com/oauth/token';
+        });
+    });
+    test('auth type query', function () {
+
+        app(RefreshToken::class)(
+            'https://example.com/oauth/token',
+            new Credentials('my_query_token'),
+            new Options(
+                scopes: ['scope1', 'scope2'],
+                authType: Credentials::AUTH_TYPE_QUERY,
+                tokenName: 'custom_token_name',
+                accessToken: function (Response $response) {
+                    return AccessToken::parseQueryTokenFromResponse($response, 'custom_token_name');
+                }
+            ),
+        );
+        Http::assertSent(function (Request $request) {
+
+            $token = AccessToken::parseQueryTokenFromUrl($request->url(), 'custom_token_name');
+
+            expect($token)->toBe('my_query_token');
+
+
+            return $request->url() === 'https://example.com/oauth/token?custom_token_name=my_query_token';
+        });
+    });
+
 })->done(assignee: 'pelmered');