Merge pull request #751 from stefanorosanelli/fix/login-redirect

fix: use `?` in route array
bedita · Apr 7, 2022 · fb98120 · fb98120
2 parents e3002a4 + 5ada910
commit fb98120
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -140,7 +140,7 @@ protected function loginRedirectRoute(): array
             return $route;
         }
 
-        return $route + compact('redirect');
+        return $route + ['?' => compact('redirect')];
     }
 
     /**

diff --git a/src/Template/Pages/Login/login.twig b/src/Template/Pages/Login/login.twig
@@ -19,7 +19,7 @@
     <div class="login-form">
 
         {{ Form.create(null, {
-            'url': {'_name': 'login', 'redirect': _view.request.getQuery('redirect') },
+            'url': {'_name': 'login', '?': {'redirect': _view.request.getQuery('redirect')}},
         })|raw }}
 
         {% if projects %}

diff --git a/tests/TestCase/Authentication/Identifier/Resolver/ApiResolverTest.php b/tests/TestCase/Authentication/Identifier/Resolver/ApiResolverTest.php
@@ -83,7 +83,6 @@ public function findProvider(): array
                         'publish_end' => null,
                     ],
                     'id' => '1',
-                    'tokens' => [],
                 ],
             ],
         ];
@@ -104,11 +103,6 @@ public function testFind(array $credentials, ?array $expected): void
         $resolver = new ApiResolver();
         $identity = $resolver->find($credentials);
 
-        if (isset($expected['tokens'])) {
-            $client = ApiClientProvider::getApiClient();
-            $expected['tokens'] = $client->getTokens();
-        }
-
         if ($expected === null) {
             static::assertNull($identity);
 

diff --git a/tests/TestCase/Controller/AppControllerTest.php b/tests/TestCase/Controller/AppControllerTest.php
@@ -221,7 +221,7 @@ public function loginRedirectRouteProvider(): array
             ],
             'redirect to /' => [
                 ['environment' => ['REQUEST_METHOD' => 'GET'], 'params' => ['object_type' => 'documents']], // config
-                ['_name' => 'login', 'redirect' => '/'], // expected
+                ['_name' => 'login', '?' => ['redirect' => '/']], // expected
             ],
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,7 +140,7 @@ protected function loginRedirectRoute(): array @@
                 return $route;
             }
-            return $route + compact('redirect');
+            return $route + ['?' => compact('redirect')];
         }
         /**
@@ Expand Down @@