X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c90e813adcec89899d9db95843295a84fb058c3e..4476731a9ec985c5abd97da453978af0dfa4406b:/src/views-components/api-token/api-token.tsx?ds=sidebyside

diff --git a/src/views-components/api-token/api-token.tsx b/src/views-components/api-token/api-token.tsx
index e4ba4914..3dc6d1a1 100644
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -5,33 +5,28 @@
 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 { 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";
 
 interface ApiTokenProps {
+    authService: AuthService;
 }
 
-class ApiToken extends React.Component<ApiTokenProps & RouteProps & DispatchProp<any>, {}> {
-    static getUrlParameter(search: string, name: string) {
-        const safeName = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
-        const regex = new RegExp('[\\?&]' + safeName + '=([^&#]*)');
-        const results = regex.exec(search);
-        return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
+export const ApiToken = connect()(
+    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()).then(() => {
+                const rootUuid = this.props.authService.getRootUuid();
+                this.props.dispatch(getProjectList(rootUuid));
+            });
+        }
+        render() {
+            return <Redirect to="/"/>;
+        }
     }
-
-    componentDidMount() {
-        const search = this.props.location ? this.props.location.search : "";
-        const apiToken = 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));
-        });
-    }
-    render() {
-        return <Redirect to="/"/>;
-    }
-}
-
-export default connect()(ApiToken);
+);
