13494: Merge branch 'master' into 13494-collection-version-browser

[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 0ae41c657e34b925acb909084b848b9bb4cce31c..f4b50e36d0fdbb7404ee014db80ec605ce51634b 100644 (file)
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -2,16 +2,21 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Redirect, RouteProps } from "react-router";
+import { RouteProps } from "react-router";
 import * as React from "react";
 import { connect, DispatchProp } from "react-redux";
-import { getUserDetails, saveApiToken } from "../../store/auth/auth-action";
-import { getProjectList } from "../../store/project/project-action";
-import { getUrlParameter } from "../../common/url";
-import { AuthService } from "../../services/auth-service/auth-service";
+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 { Config } from "~/common/config";
+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()(
@@ -19,14 +24,26 @@ 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(() => {
-                const rootUuid = this.props.authService.getRootUuid();
-                this.props.dispatch(getProjectList(rootUuid));
+            const loadMainApp = this.props.loadMainApp;
+            this.props.dispatch<any>(saveApiToken(apiToken)).finally(() => {
+                const redirectURL = this.props.authService.getTargetURL();
+
+                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);
+                    }
+                }
             });
         }
         render() {
-            return <Redirect to="/"/>;
+            return <div />;
         }
     }
 );