Merge branch 'master'

[arvados.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..4fa87a28b8471249c1dbb085e470a5b15545eff8 100644 (file)
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -5,12 +5,14 @@
 import { Redirect, 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 { 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 { loadWorkbench } from '../../store/navigation/navigation-action';
 
 interface ApiTokenProps {
+    authService: AuthService;
 }
 
 export const ApiToken = connect()(
@@ -18,10 +20,10 @@ 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(saveApiToken(apiToken));
             this.props.dispatch<any>(getUserDetails()).then(() => {
-                const rootUuid = authService.getRootUuid();
-                this.props.dispatch(getProjectList(rootUuid));
+                const rootUuid = this.props.authService.getRootUuid();
+                this.props.dispatch(loadWorkbench());
             });
         }
         render() {