fix(auth)- Fix Redirect url flow in OidcCallback (#11878)

mkamalas · web-flow · commit 2a37483b49fb · 2024-11-20T14:07:07.000-06:00
diff --git a/datahub-frontend/app/auth/sso/oidc/OidcCallbackLogic.java b/datahub-frontend/app/auth/sso/oidc/OidcCallbackLogic.java
@@ -130,8 +130,6 @@ public Object perform(
     CallContext ctx = ctxResult.getFirst();
     Result result = (Result) ctxResult.getSecond();
 
-    setContextRedirectUrl(ctx);
-
     // Handle OIDC authentication errors.
     if (OidcResponseErrorHandler.isError(ctx)) {
       return OidcResponseErrorHandler.handleError(ctx);
@@ -192,6 +190,9 @@ private Pair<CallContext, Object> superPerform(
           }
         }
 
+        // Set the redirect url from cookie before creating action
+        setContextRedirectUrl(ctx);
+
         action = this.redirectToOriginallyRequestedUrl(ctx, defaultUrl);
       }
     } catch (RuntimeException var20) {

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,6 @@ public Object perform(`
`130`	`130`	`CallContext ctx = ctxResult.getFirst();`
`131`	`131`	`Result result = (Result) ctxResult.getSecond();`
`132`	`132`
`133`		`- setContextRedirectUrl(ctx);`
`134`		`-`
`135`	`133`	`// Handle OIDC authentication errors.`
`136`	`134`	`if (OidcResponseErrorHandler.isError(ctx)) {`
`137`	`135`	`return OidcResponseErrorHandler.handleError(ctx);`
`@@ -192,6 +190,9 @@ private Pair<CallContext, Object> superPerform(`
`192`	`190`	`}`
`193`	`191`	`}`
`194`	`192`
	`193`	`+ // Set the redirect url from cookie before creating action`
	`194`	`+ setContextRedirectUrl(ctx);`
	`195`	`+`
`195`	`196`	`action = this.redirectToOriginallyRequestedUrl(ctx, defaultUrl);`
`196`	`197`	`}`
`197`	`198`	`} catch (RuntimeException var20) {`