X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cc493b89840b48f40c2beaf626994724331aa196..08ff9a348a1177bb0cf8516f36c5d6a28be3778b:/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 41fce727..43c55a92 100644 --- 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 { getUserDetails, saveApiToken } from "~/store/auth/auth-action"; +import { authActions, getUserDetails, saveApiToken } from "~/store/auth/auth-action"; import { getUrlParameter } from "~/common/url"; import { AuthService } from "~/services/auth-service/auth-service"; +import { navigateToRootProject } from "~/store/navigation/navigation-action"; +import { User } from "~/models/user"; +import { Config } from "~/common/config"; +import { initSessions } from "~/store/auth/auth-action-session"; interface ApiTokenProps { authService: AuthService; + config: Config; } export const ApiToken = connect()( @@ -19,10 +24,14 @@ export const ApiToken = connect()( const search = this.props.location ? this.props.location.search : ""; const apiToken = getUrlParameter(search, 'api_token'); this.props.dispatch(saveApiToken(apiToken)); - this.props.dispatch(getUserDetails()); + this.props.dispatch(getUserDetails()).then((user: User) => { + this.props.dispatch(initSessions(this.props.authService, this.props.config, user)); + }).finally(() => { + this.props.dispatch(navigateToRootProject); + }); } render() { - return ; + return
; } } );