Merge pull request #135 from VineetBala-AOT/main

Preserve return path during OIDC sign-in redirect

Author: jadmsaadaot

condition-web/src/routes/_authenticated.tsx

@@ -4,6 +4,7 @@ import { createFileRoute, Navigate, Outlet } from "@tanstack/react-router";
 import { useEffect } from "react";
 import { useAuth } from "react-oidc-context";
 import { useHasAllowedRoles, KeycloakRoles } from "@/hooks/useAuthorization";
+import { OidcConfig } from "@/utils/config";
 
 export const Route = createFileRoute("/_authenticated")({
   component: Auth,
@@ -27,7 +28,7 @@ function Auth() {
 
   useEffect(() => {
     if (!isAuthenticated && !isUserAuthLoading) {
-      signinRedirect();
+      signinRedirect({redirect_uri: `${OidcConfig.redirect_uri}?path=${window.location.pathname}`});
     }
   }, [
     isAuthenticated,

condition-web/src/routes/oidc-callback.tsx

@@ -11,6 +11,8 @@ export const Route = createFileRoute("/oidc-callback")({
 function OidcCallback() {
   const { error: getAuthError, user: kcUser } = useAuth();
   const [isAuthLoading, setIsAuthLoading] = useState(true);
+  const params = new URLSearchParams(window.location.search);
+  const path = params.get("path");
 
   useEffect(() => {
     if (kcUser) {
@@ -22,8 +24,9 @@ function OidcCallback() {
     guid: kcUser?.profile.sub,
   });
 
-  if (userData?.auth_guid) {
-    return <Navigate to="/projects" />;
+  if (userData?.auth_guid ) {
+    const navPath = path ?? '/projects'
+    return <Navigate to={navPath} />;
   }
 
   if (getAuthError) {