X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/2d03b09bc6f29ab1bfe42a2fd3a88f17189e6a52..refs/heads/17231-stuck-on-loading-page-after-login:/src/views-components/api-token/api-token.tsx

diff --git a/src/views-components/api-token/api-token.tsx b/src/views-components/api-token/api-token.tsx
index e11afa7b..97d3fc40 100644
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -4,6 +4,7 @@
 
 import { RouteProps } from "react-router";
 import * as React from "react";
+import { RootState } from "~/store/store";
 import { connect, DispatchProp } from "react-redux";
 import { saveApiToken } from "~/store/auth/auth-action";
 import { getUrlParameter } from "~/common/url";
@@ -11,30 +12,43 @@ import { AuthService } from "~/services/auth-service/auth-service";
 import { navigateToRootProject, navigateToLinkAccount } from "~/store/navigation/navigation-action";
 import { Config } from "~/common/config";
 import { getAccountLinkData } from "~/store/link-account-panel/link-account-panel-actions";
+import { replace } from "react-router-redux";
+import { User } from "~/models/user";
 
 interface ApiTokenProps {
     authService: AuthService;
     config: Config;
     loadMainApp: boolean;
+    user?: User;
 }
 
-export const ApiToken = connect()(
+export const ApiToken = connect((state: RootState) => ({
+    user: state.auth.user,
+}), null)(
     class extends React.Component<ApiTokenProps & RouteProps & DispatchProp<any>, {}> {
         componentDidMount() {
             const search = this.props.location ? this.props.location.search : "";
             const apiToken = getUrlParameter(search, 'api_token');
-            const loadMainApp = this.props.loadMainApp;
-            this.props.dispatch<any>(saveApiToken(apiToken)).finally(() => {
-                if (loadMainApp) {
-                    if (this.props.dispatch(getAccountLinkData())) {
-                        this.props.dispatch(navigateToLinkAccount);
-                    }
-                    else {
-                        this.props.dispatch(navigateToRootProject);
-                    }
+            this.props.dispatch<any>(saveApiToken(apiToken));
+        }
+
+        componentDidUpdate() {
+            const redirectURL = this.props.authService.getTargetURL();
+
+            if (this.props.loadMainApp && this.props.user) {
+                if (redirectURL) {
+                    this.props.authService.removeTargetURL();
+                    this.props.dispatch(replace(redirectURL));
                 }
-            });
+                else if (this.props.dispatch(getAccountLinkData())) {
+                    this.props.dispatch(navigateToLinkAccount);
+                }
+                else {
+                    this.props.dispatch(navigateToRootProject);
+                }
+            }
         }
+
         render() {
             return <div />;
         }