X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/299d867b60f431b0dfa50f42630bca91ae53337d..ecd0b3c069eed7d411e3cec7d707b43ab6675081:/src/store/auth/auth-action-session.ts diff --git a/src/store/auth/auth-action-session.ts b/src/store/auth/auth-action-session.ts index a63878286a..fc35ff8805 100644 --- a/src/store/auth/auth-action-session.ts +++ b/src/store/auth/auth-action-session.ts @@ -7,7 +7,7 @@ import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions"; import { RootState } from "~/store/store"; import { ServiceRepository, createServices, setAuthorizationHeader } from "~/services/services"; import Axios from "axios"; -import { getUserFullname, User } from "~/models/user"; +import { User, getUserDisplayName } from "~/models/user"; import { authActions } from "~/store/auth/auth-action"; import { Config, ClusterConfigJSON, CLUSTER_CONFIG_PATH, DISCOVERY_DOC_PATH, @@ -131,7 +131,7 @@ export const validateSession = (session: Session, activeSession: Session) => session.token = token; session.email = user.email; session.uuid = user.uuid; - session.name = getUserFullname(user); + session.name = getUserDisplayName(user); session.loggedIn = true; session.apiRevision = apiRevision; }; @@ -200,6 +200,19 @@ export const validateSessions = () => } }; +export const addRemoteConfig = (remoteHost: string) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const config = await getRemoteHostConfig(remoteHost); + if (!config) { + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: `Could not get config for ${remoteHost}`, + kind: SnackbarKind.ERROR + })); + return; + } + dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config })); + }; + export const addSession = (remoteHost: string, token?: string, sendToLogin?: boolean) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const sessions = getState().auth.sessions; @@ -229,7 +242,7 @@ export const addSession = (remoteHost: string, token?: string, sendToLogin?: boo status: SessionStatus.VALIDATED, active: false, email: user.email, - name: getUserFullname(user), + name: getUserDisplayName(user), uuid: user.uuid, baseUrl: config.baseUrl, clusterId: config.uuidPrefix,