X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/087d49d5c43866c8a20e8ac830ccc9b12188408f..d924f14c5a81265fbd0f550ccf498fe791fc5b54:/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 1c9d1d14..f0093f9f 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,40 +16,48 @@ 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 +const getClusterConfig = async (origin: string, apiClient: AxiosInstance): Promise => { + let configFromDD: Config | undefined; try { - const config = (await Axios.get(`${origin}/${CLUSTER_CONFIG_PATH}`)).data; - return buildConfig(config); - } catch { } - - // Fall back to discovery document - 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 apiClient.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 public config endpoint + try { + const config = (await apiClient.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; }; -const getRemoteHostConfig = async (remoteHost: string): Promise => { +const getRemoteHostConfig = async (remoteHost: string, useApiClient?: AxiosInstance): Promise => { + const apiClient = useApiClient || Axios.create({ headers: {} }); + let url = remoteHost; if (url.indexOf('://') < 0) { url = 'https://' + url; @@ -57,14 +65,14 @@ const getRemoteHostConfig = async (remoteHost: string): Promise = const origin = new URL(url).origin; // Maybe it is an API server URL, try fetching config and discovery doc - let r = await getClusterConfig(origin); + let r = await getClusterConfig(origin, apiClient); if (r !== null) { return r; } // Maybe it is a Workbench2 URL, try getting config.json try { - r = await getClusterConfig((await Axios.get(`${origin}/config.json`)).data.API_HOST); + r = await getClusterConfig((await apiClient.get(`${origin}/config.json`)).data.API_HOST, apiClient); if (r !== null) { return r; } @@ -72,7 +80,7 @@ const getRemoteHostConfig = async (remoteHost: string): Promise = // Maybe it is a Workbench1 URL, try getting status.json try { - r = await getClusterConfig((await Axios.get(`${origin}/status.json`)).data.apiBaseURL); + r = await getClusterConfig((await apiClient.get(`${origin}/status.json`)).data.apiBaseURL, apiClient); if (r !== null) { return r; } @@ -81,15 +89,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,49 +112,45 @@ 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(); 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, }; }; -export const validateSession = (session: Session, activeSession: Session) => +export const validateSession = (session: Session, activeSession: Session, useApiClient?: AxiosInstance) => async (dispatch: Dispatch): Promise => { 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.userIsActive = user.isActive; session.uuid = user.uuid; - session.name = getUserFullname(user); + session.name = getUserDisplayName(user); session.loggedIn = true; + session.apiRevision = apiRevision; }; let fail: Error | null = null; - const config = await getRemoteHostConfig(session.remoteHost); + const config = await getRemoteHostConfig(session.remoteHost, useApiClient); if (config !== null) { 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) { @@ -176,7 +171,7 @@ export const validateSession = (session: Session, activeSession: Session) => return session; }; -export const validateSessions = () => +export const validateSessions = (useApiClient?: AxiosInstance) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const sessions = getState().auth.sessions; const activeSession = getActiveSession(sessions); @@ -194,7 +189,7 @@ export const validateSessions = () => override it using Dispatch. This pattern is used in a bunch of different places in Workbench2. */ - await dispatch(validateSession(session, activeSession)); + await dispatch(validateSession(session, activeSession, useApiClient)); } catch (e) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, @@ -203,11 +198,24 @@ export const validateSessions = () => } } } - services.authService.saveSessions(sessions); + services.authService.saveSessions(getState().auth.sessions); dispatch(progressIndicatorActions.STOP_WORKING("sessionsValidation")); } }; +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,18 +245,20 @@ export const addSession = (remoteHost: string, token?: string, sendToLogin?: boo status: SessionStatus.VALIDATED, active: false, email: user.email, - name: getUserFullname(user), + userIsActive: user.isActive, + 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)) { - dispatch(authActions.UPDATE_SESSION(session)); + await dispatch(authActions.UPDATE_SESSION(session)); } else { - dispatch(authActions.ADD_SESSION(session)); + await dispatch(authActions.ADD_SESSION(session)); } services.authService.saveSessions(getState().auth.sessions); @@ -302,9 +312,8 @@ export const toggleSession = (session: Session) => export const initSessions = (authService: AuthService, config: Config, user: User) => (dispatch: Dispatch) => { const sessions = authService.buildSessions(config, user); - authService.saveSessions(sessions); dispatch(authActions.SET_SESSIONS(sessions)); - dispatch(validateSessions()); + dispatch(validateSessions(authService.apiClient)); }; export const loadSiteManagerPanel = () =>