X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/45ee419ff7952fc722a139666c327a321a92cc81..2c7ded941806dfa7da0d4e2255257a5e022efe8f:/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 5b8acf9a..8fc17810 100644 --- a/src/store/auth/auth-action-session.ts +++ b/src/store/auth/auth-action-session.ts @@ -5,9 +5,9 @@ import { Dispatch } from "redux"; import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions"; import { RootState } from "~/store/store"; -import { ServiceRepository } from "~/services/services"; +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, @@ -16,36 +16,42 @@ import { import { normalizeURLPath } from "~/common/url"; import { Session, SessionStatus } from "~/models/session"; import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; -import { AuthService, UserDetailsResponse } from "~/services/auth-service/auth-service"; +import { AuthService } from "~/services/auth-service/auth-service"; import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; import * as jsSHA from "jssha"; const getClusterConfig = async (origin: string): Promise => { - // Try the new public config endpoint - try { - const config = (await Axios.get(`${origin}/${CLUSTER_CONFIG_PATH}`)).data; - return buildConfig(config); - } catch { } - - // Fall back to discovery document + let configFromDD: Config | undefined; try { - const config = (await Axios.get(`${origin}/${DISCOVERY_DOC_PATH}`)).data; - return { - baseUrl: normalizeURLPath(config.baseUrl), - keepWebServiceUrl: config.keepWebServiceUrl, - remoteHosts: config.remoteHosts, - rootUrl: config.rootUrl, - uuidPrefix: config.uuidPrefix, - websocketUrl: config.websocketUrl, - workbenchUrl: config.workbenchUrl, - workbench2Url: config.workbench2Url, + const dd = (await Axios.get(`${origin}/${DISCOVERY_DOC_PATH}`)).data; + configFromDD = { + baseUrl: normalizeURLPath(dd.baseUrl), + keepWebServiceUrl: dd.keepWebServiceUrl, + remoteHosts: dd.remoteHosts, + rootUrl: dd.rootUrl, + uuidPrefix: dd.uuidPrefix, + websocketUrl: dd.websocketUrl, + workbenchUrl: dd.workbenchUrl, + workbench2Url: dd.workbench2Url, loginCluster: "", vocabularyUrl: "", fileViewersConfigUrl: "", - clusterConfig: mockClusterConfigJSON({}) + clusterConfig: mockClusterConfigJSON({}), + apiRevision: parseInt(dd.revision, 10), }; } catch { } + // Try the new public config endpoint + try { + const config = (await Axios.get(`${origin}/${CLUSTER_CONFIG_PATH}`)).data; + return { ...buildConfig(config), apiRevision: configFromDD ? configFromDD.apiRevision : 0 }; + } catch { } + + // Fall back to discovery document + if (configFromDD !== undefined) { + return configFromDD; + } + return null; }; @@ -81,15 +87,6 @@ const getRemoteHostConfig = async (remoteHost: string): Promise = return null; }; -const getUserDetails = async (baseUrl: string, token: string): Promise => { - const resp = await Axios.get(`${baseUrl}/users/current`, { - headers: { - Authorization: `OAuth2 ${token}` - } - }); - return resp.data; -}; - const invalidV2Token = "Must be a v2 token"; export const getSaltedToken = (clusterId: string, token: string) => { @@ -113,19 +110,13 @@ export const validateCluster = async (config: Config, useToken: string): Promise<{ user: User; token: string }> => { const saltedToken = getSaltedToken(config.uuidPrefix, useToken); - const user = await getUserDetails(config.baseUrl, saltedToken); + + const svc = createServices(config, { progressFn: () => { }, errorFn: () => { } }); + setAuthorizationHeader(svc, saltedToken); + + const user = await svc.authService.getUserDetails(false); return { - user: { - firstName: user.first_name, - lastName: user.last_name, - uuid: user.uuid, - ownerUuid: user.owner_uuid, - email: user.email, - isAdmin: user.is_admin, - isActive: user.is_active, - username: user.username, - prefs: user.prefs - }, + user, token: saltedToken, }; }; @@ -135,13 +126,14 @@ export const validateSession = (session: Session, activeSession: Session) => dispatch(authActions.UPDATE_SESSION({ ...session, status: SessionStatus.BEING_VALIDATED })); session.loggedIn = false; - const setupSession = (baseUrl: string, user: User, token: string) => { + const setupSession = (baseUrl: string, user: User, token: string, apiRevision: number) => { session.baseUrl = baseUrl; 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; }; let fail: Error | null = null; @@ -150,12 +142,12 @@ export const validateSession = (session: Session, activeSession: Session) => dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config })); try { const { user, token } = await validateCluster(config, session.token); - setupSession(config.baseUrl, user, token); + setupSession(config.baseUrl, user, token, config.apiRevision); } catch (e) { fail = new Error(`Getting current user for ${session.remoteHost}: ${e.message}`); try { const { user, token } = await validateCluster(config, activeSession.token); - setupSession(config.baseUrl, user, token); + setupSession(config.baseUrl, user, token, config.apiRevision); fail = null; } catch (e2) { if (e.message === invalidV2Token) { @@ -196,10 +188,11 @@ export const validateSessions = () => places in Workbench2. */ await dispatch(validateSession(session, activeSession)); } catch (e) { - dispatch(snackbarActions.OPEN_SNACKBAR({ - message: e.message, - kind: SnackbarKind.ERROR - })); + // Don't do anything here. User may get + // spammed with multiple messages that are not + // helpful. They can see the individual + // errors by going to site manager and trying + // to toggle the session. } } } @@ -208,6 +201,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; @@ -237,12 +243,13 @@ 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, remoteHost, - token + token, + apiRevision: config.apiRevision, }; if (sessions.find(s => s.clusterId === config.uuidPrefix)) {