Add tests

Author: riasvdv

src/Http/Controllers/PreviewController.php

@@ -44,7 +44,7 @@ public function createToken(Tokens $tokens, Request $request): JsonResponse|Redi
         };
 
         $token = $tokens->createPreviewToken([
-            'preview/preview', [
+            action(self::preview(...), absolute: false), [
                 'elementType' => $data['elementType'],
                 'canonicalId' => (int) $canonicalId,
                 'siteId' => (int) $data['siteId'],
@@ -123,11 +123,6 @@ public function preview(Request $request, Kernel $kernel): mixed
 
         /** @var \Illuminate\Support\Uri $originalUri */
         $originalUri = Context::pullHidden(HandleTokenRequest::ORIGINAL_URI_KEY);
-        $originalUri = $originalUri->withoutQuery([
-            'token',
-            'x-craft-preview',
-            'x-craft-live-preview',
-        ]);
 
         $newRequest = $request->duplicateWithUri(
             newUri: $originalUri->value(),

src/Http/Middleware/HandleTokenRequest.php

@@ -50,11 +50,13 @@ public function handle(Request $request, Closure $next): mixed
             return $next($request);
         }
 
-        Context::addHidden(self::ORIGINAL_URI_KEY, $request->uri());
+        Context::addHidden(self::ORIGINAL_URI_KEY, $request->uri()->withoutQuery([
+            'token',
+            'x-craft-preview',
+            'x-craft-live-preview',
+        ]));
 
-        $route = $request->actionSegmentsToRoute(explode('/', (string) $tokenRoute[0]));
-
-        $newRequest = $request->duplicateWithUri($route, $tokenRoute[1] ?? []);
+        $newRequest = $request->duplicateWithUri((string) $tokenRoute[0], $tokenRoute[1] ?? []);
 
         return $next($newRequest);
     }

tests/Http/Middleware/HandleTokenRequestTest.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+use CraftCms\Cms\Cms;
+use CraftCms\Cms\Http\Middleware\HandleTokenRequest;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Token\Tokens;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Context;
+
+beforeEach(function () {
+    $this->middleware = app(HandleTokenRequest::class);
+});
+
+it('does nothing if there is no token or token header', function () {
+    expect($this->middleware->handle(Request::create('foo'), fn () => 'bar'))->toBe('bar');
+});
+
+it('throws if an invalid token is passed', function () {
+    $this->expectExceptionMessage('Invalid token');
+
+    $this->middleware->handle(Request::create('foo', parameters: [
+        Cms::config()->tokenParam => 'invalid token',
+    ]), fn () => 'bar');
+});
+
+it('adds the token to the context', function () {
+    $this->middleware->handle(Request::create('foo', parameters: [
+        Cms::config()->tokenParam => Str::random(32),
+    ]), fn () => 'bar');
+
+    expect(Context::getHidden(HandleTokenRequest::TOKEN_KEY))
+        ->not()
+        ->toBeNull();
+});
+
+it('does nothing more when the token does not return a route', function () {
+    $result = $this->middleware->handle(Request::create('foo', parameters: [
+        Cms::config()->tokenParam => Str::random(32),
+    ]), fn () => 'bar');
+
+    expect($result)->toBe('bar');
+});
+
+it('returns the response of the token route', function () {
+    $token = app(Tokens::class)->createToken('token/route');
+
+    $result = $this->middleware->handle(Request::create('foo', parameters: [
+        Cms::config()->tokenParam => $token,
+    ]), function (?Request $request = null) {
+        if (! is_null($request)) {
+            return $request->path();
+        }
+
+        return 'bar';
+    });
+
+    expect($result)->toBe('token/route');
+
+    /** @var ?\Illuminate\Support\Uri $originalUri */
+    $originalUri = Context::getHidden(HandleTokenRequest::ORIGINAL_URI_KEY);
+
+    expect($originalUri)->not()->toBeNull();
+    expect($originalUri->value())->toBe(url('foo'));
+});

tests/Http/Middleware/RequireTokenTest.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use CraftCms\Cms\Http\Middleware\HandleTokenRequest;
+use CraftCms\Cms\Http\Middleware\RequireToken;
+use Illuminate\Support\Facades\Context;
+
+it('throws if no token is found', function () {
+    $this->expectExceptionMessage('Valid token required');
+
+    app(RequireToken::class)->handle(Request::create('foo'), fn () => 'bar');
+});
+
+it('returns next if token is found', function () {
+    Context::addHidden(HandleTokenRequest::TOKEN_KEY, 'token');
+
+    expect(app(RequireToken::class)->handle(Request::create('foo'), fn () => 'bar'))->toBe('bar');
+});