5124: Handled destination parameter in URL

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_cura_login/src/Controller/Os2loopCuraLoginController.php

@@ -19,6 +19,7 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -116,8 +117,8 @@ public function start(Request $request, ?string $jwt): Response {
       }
 
       return Request::METHOD_POST === $request->getMethod()
-        ? $this->createAuthenticateResponse($user)
-        : $this->authenticateUser($user);
+        ? $this->createAuthenticateResponse($user, $request)
+        : $this->authenticateUser($user, $request);
     }
     catch (\Exception $exception) {
       $this->error('start: @message', ['@message' => $exception->getMessage(), $exception]);
@@ -146,7 +147,7 @@ public function authenticate(Request $request, string $jwt): Response {
         throw new BadRequestHttpException();
       }
 
-      return $this->authenticateUser($user);
+      return $this->authenticateUser($user, $request);
     }
     catch (\Exception $exception) {
       $this->error('authenticate: @message', ['@message' => $exception->getMessage(), $exception]);
@@ -157,7 +158,7 @@ public function authenticate(Request $request, string $jwt): Response {
   /**
    * Create authenticate response.
    */
-  private function createAuthenticateResponse(UserInterface $user): Response {
+  private function createAuthenticateResponse(UserInterface $user, Request $request): Response {
     // https://github.com/firebase/php-jwt?tab=readme-ov-file#example
     $payload = [
       // Issued at.
@@ -168,22 +169,37 @@ private function createAuthenticateResponse(UserInterface $user): Response {
     ];
     $jwt = $this->encodeJwt($payload);
 
-    $url = Url::fromRoute('os2loop_cura_login.authenticate', [
+    $routeParameters = [
       'jwt' => $jwt,
-    ])->setAbsolute()->toString(TRUE)->getGeneratedUrl();
+    ];
+    if ($destination = $request->query->get('destination')) {
+      $routeParameters['destination'] = $destination;
+    }
+
+    $url = Url::fromRoute('os2loop_cura_login.authenticate', $routeParameters)
+      ->setAbsolute()->toString(TRUE)->getGeneratedUrl();
 
     return new Response($url);
   }
 
   /**
    * Authenticate user.
    */
-  private function authenticateUser($user): Response {
-    user_login_finalize($user);
+  private function authenticateUser($user, Request $request): Response {
+    $this->userHelper->authenticateUser($user);
 
     $this->messenger()->addStatus($this->t('Welcome Cura user @user.', ['@user' => $user->getDisplayName()]));
+    $url = Url::fromRoute('<front>');
+    if ($destination = $request->query->get('destination')) {
+      try {
+        $url = Url::fromUserInput($destination);
+      }
+      catch (\Exception) {
+        // Ignore any exceptions.
+      }
+    }
 
-    return $this->redirect('<front>');
+    return new RedirectResponse($url->setAbsolute()->toString());
   }
 
   /**

web/profiles/custom/os2loop/modules/os2loop_cura_login/src/UserHelper.php

@@ -63,4 +63,11 @@ public function loadUser(string $username) : ?UserInterface {
     return reset($users) ?: NULL;
   }
 
+  /**
+   * Authenticate user.
+   */
+  public function authenticateUser($user) {
+    user_login_finalize($user);
+  }
+
 }