forward redirectUrl to SSO page

OneUptime · May 4, 2023 · 2661cea · 2661cea
1 parent 2e3997a
commit 2661cea
Showing 1 changed file with 32 additions and 11 deletions.
diff --git a/StatusPage/src/Pages/Accounts/Login.tsx b/StatusPage/src/Pages/Accounts/Login.tsx
@@ -31,17 +31,38 @@ const LoginPage: FunctionComponent<ComponentProps> = (
 ) => {
     useEffect(() => {
         if (props.forceSSO && props.statusPageId) {
-            Navigation.navigate(
-                !props.isPreviewPage
-                    ? RouteUtil.populateRouteParams(
-                          RouteMap[PageMap.SSO]!,
-                          props.statusPageId
-                      )
-                    : RouteUtil.populateRouteParams(
-                          RouteMap[PageMap.PREVIEW_SSO]!,
-                          props.statusPageId
-                      )
-            );
+            if (Navigation.getQueryStringByName('redirectUrl')) {
+                // forward redirect url to sso page
+                Navigation.navigate(
+                    new Route(
+                        (!props.isPreviewPage
+                            ? RouteUtil.populateRouteParams(
+                                  RouteMap[PageMap.SSO]!,
+                                  props.statusPageId
+                              )
+                            : RouteUtil.populateRouteParams(
+                                  RouteMap[PageMap.PREVIEW_SSO]!,
+                                  props.statusPageId
+                              )
+                        ).toString() +
+                            `?redirectUrl=${Navigation.getQueryStringByName(
+                                'redirectUrl'
+                            )}`
+                    )
+                );
+            } else {
+                Navigation.navigate(
+                    !props.isPreviewPage
+                        ? RouteUtil.populateRouteParams(
+                              RouteMap[PageMap.SSO]!,
+                              props.statusPageId
+                          )
+                        : RouteUtil.populateRouteParams(
+                              RouteMap[PageMap.PREVIEW_SSO]!,
+                              props.statusPageId
+                          )
+                );
+            }
         }
     }, [props.forceSSO, props.statusPageId]);