X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1a9eb2261e6030ba78078e2a206bad27653f2475..37f3a8d7a7ce05a15fbb9219763b46ba1c250976:/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 e4ba4914a3..97d3fc4019 100644
--- a/src/views-components/api-token/api-token.tsx
+++ b/src/views-components/api-token/api-token.tsx
@@ -2,36 +2,55 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Redirect, RouteProps } from "react-router";
+import { RouteProps } from "react-router";
 import * as React from "react";
+import { RootState } from "~/store/store";
 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 { 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";
+import { User } from "~/models/user";
 
 interface ApiTokenProps {
+    authService: AuthService;
+    config: Config;
+    loadMainApp: boolean;
+    user?: User;
 }
 
-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((state: RootState) => ({
+    user: state.auth.user,
+}), null)(
+    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<any>(saveApiToken(apiToken));
+        }
 
-    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="/"/>;
-    }
-}
+        componentDidUpdate() {
+            const redirectURL = this.props.authService.getTargetURL();
+
+            if (this.props.loadMainApp && this.props.user) {
+                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);
+                }
+            }
+        }
 
-export default connect()(ApiToken);
+        render() {
+            return <div />;
+        }
+    }
+);
