Merge pull request #67858 from elkmaster/bp-21.1-login-redirect

ui: fix redirect to requested page after login [backport 21.1]
cockroachdb · Jul 23, 2021 · cd004bd · cd004bd
2 parents 6157193 + 5d82333
commit cd004bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/pkg/ui/src/redux/login.ts b/pkg/ui/src/redux/login.ts
@@ -130,17 +130,15 @@ function shouldRedirect(location: Location) {
 }
 
 export function getLoginPage(location: Location) {
-  const query = !shouldRedirect(location)
+  const redirectTo = !shouldRedirect(location)
     ? undefined
-    : {
-        redirectTo: createPath({
-          pathname: location.pathname,
-          search: location.search,
-        }),
-      };
+    : createPath({
+        pathname: location.pathname,
+        search: location.search,
+      });
   return {
     pathname: LOGIN_PAGE,
-    query: query,
+    search: `?redirectTo=${encodeURIComponent(redirectTo)}`,
   };
 }
 

diff --git a/pkg/ui/src/views/login/loginPage.tsx b/pkg/ui/src/views/login/loginPage.tsx
@@ -124,7 +124,7 @@ export class LoginPage extends React.Component<Props> {
       const { location, history } = this.props;
       const params = new URLSearchParams(location.search);
       if (params.has("redirectTo")) {
-        history.push(params.get("redirectTo"));
+        history.push(decodeURIComponent(params.get("redirectTo")));
       } else {
         history.push("/");
       }