X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c0b0f2e4f2f795e06412db84c77b6b0447815ca2..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 718d3589..97d3fc40 100644
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -4,28 +4,53 @@
 
 import { RouteProps } from "react-router";
 import * as React from "react";
+import { RootState } from "~/store/store";
 import { connect, DispatchProp } from "react-redux";
-import { getUserDetails, saveApiToken } from "~/store/auth/auth-action";
+import { saveApiToken } from "~/store/auth/auth-action";
 import { getUrlParameter } from "~/common/url";
 import { AuthService } from "~/services/auth-service/auth-service";
-import { navigateToRootProject } from "~/store/navigation/navigation-action";
+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');
-            this.props.dispatch(saveApiToken(apiToken));
-            this.props.dispatch<any>(getUserDetails()).finally(() => {
-                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/>;
+            return <div />;
         }
     }
 );