15803: Refactor internal user and API token management

[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 1d017ccdffe754ab0fa7ca1dc2777b5fcd985c61..e11afa7bf3395b587e23c312bf331b69151c8a97 100644 (file)
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -2,15 +2,20 @@
 //
 // 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 { authActions, getUserDetails } from "../../store/auth/auth-action";
-import { authService } from "../../services/services";
-import { getProjectList } from "../../store/project/project-action";
-import { getUrlParameter } from "../../common/url";
+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";
 
 interface ApiTokenProps {
+    authService: AuthService;
+    config: Config;
+    loadMainApp: boolean;
 }
 
 export const ApiToken = connect()(
@@ -18,14 +23,20 @@ export const ApiToken = connect()(
         componentDidMount() {
             const search = this.props.location ? this.props.location.search : "";
             const apiToken = getUrlParameter(search, 'api_token');
-            this.props.dispatch(authActions.SAVE_API_TOKEN(apiToken));
-            this.props.dispatch<any>(getUserDetails()).then(() => {
-                const rootUuid = authService.getRootUuid();
-                this.props.dispatch(getProjectList(rootUuid));
+            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);
+                    }
+                }
             });
         }
         render() {
-            return <Redirect to="/"/>;
+            return <div />;
         }
     }
 );