17231: Added timeout to allow app to load properly before redirect

[arvados-workbench2.git] / 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 b0fd03134c613fff4a3be001fd88cd8c02d5e73c..548dfe772291690adbb5b728618033c04af6fcf1 100644 (file)
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -5,18 +5,18 @@
 import { RouteProps } from "react-router";
 import * as React from "react";
 import { connect, DispatchProp } from "react-redux";
-import { authActions, 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, navigateToLinkAccount } from "~/store/navigation/navigation-action";
-import { User } from "~/models/user";
 import { Config } from "~/common/config";
-import { initSessions } from "~/store/auth/auth-action-session";
 import { getAccountLinkData } from "~/store/link-account-panel/link-account-panel-actions";
+import { replace } from "react-router-redux";
 
 interface ApiTokenProps {
     authService: AuthService;
     config: Config;
+    loadMainApp: boolean;
 }
 
 export const ApiToken = connect()(
@@ -24,20 +24,28 @@ export const ApiToken = connect()(
         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()).then((user: User) => {
-                this.props.dispatch(initSessions(this.props.authService, this.props.config, user));
-            }).finally(() => {
-                if (this.props.dispatch(getAccountLinkData())) {
-                    this.props.dispatch(navigateToLinkAccount);
-                }
-                else {
-                    this.props.dispatch(navigateToRootProject);
-                }
+            const loadMainApp = this.props.loadMainApp;
+            this.props.dispatch<any>(saveApiToken(apiToken)).finally(() => {
+                const redirectURL = this.props.authService.getTargetURL();
+
+                setTimeout(() => {
+                    if (loadMainApp) {
+                        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);
+                        }
+                    }
+                }, 0);
             });
         }
         render() {
-            return <div/>;
+            return <div />;
         }
     }
 );