X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ceb4f50aeca2bb6b0354a7bd96a599b4a14147fe..abe9787195984a919095b4a4c2b82c7a0baf0801:/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 2a9733f00b..c1b97adc3e 100644 --- a/src/store/auth/auth-action-session.ts +++ b/src/store/auth/auth-action-session.ts @@ -5,46 +5,51 @@ 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 { authActions } from "~/store/auth/auth-action"; -import { Config, ClusterConfigJSON, CLUSTER_CONFIG_PATH, DISCOVERY_DOC_PATH, ARVADOS_API_PATH } from "~/common/config"; +import { + Config, ClusterConfigJSON, CLUSTER_CONFIG_PATH, DISCOVERY_DOC_PATH, + buildConfig, mockClusterConfigJSON +} from "~/common/config"; 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 getClusterInfo = async (origin: string): Promise<{ clusterId: string, baseUrl: string } | null> => { +const getClusterConfig = async (origin: string): Promise => { // Try the new public config endpoint try { const config = (await Axios.get(`${origin}/${CLUSTER_CONFIG_PATH}`)).data; - return { - clusterId: config.ClusterID, - baseUrl: normalizeURLPath(`${config.Services.Controller.ExternalURL}/${ARVADOS_API_PATH}`) - }; + return buildConfig(config); } catch { } // Fall back to discovery document try { const config = (await Axios.get(`${origin}/${DISCOVERY_DOC_PATH}`)).data; return { - clusterId: config.uuidPrefix, - baseUrl: normalizeURLPath(config.baseUrl) + 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, + loginCluster: "", + vocabularyUrl: "", + fileViewersConfigUrl: "", + clusterConfig: mockClusterConfigJSON({}) }; } catch { } return null; }; -interface RemoteHostInfo { - clusterId: string; - baseUrl: string; -} - -const getRemoteHostInfo = async (remoteHost: string): Promise => { +const getRemoteHostConfig = async (remoteHost: string): Promise => { let url = remoteHost; if (url.indexOf('://') < 0) { url = 'https://' + url; @@ -52,14 +57,14 @@ const getRemoteHostInfo = async (remoteHost: string): Promise(`${origin}/config.json`)).data.API_HOST); + r = await getClusterConfig((await Axios.get(`${origin}/config.json`)).data.API_HOST); if (r !== null) { return r; } @@ -67,7 +72,7 @@ const getRemoteHostInfo = async (remoteHost: string): Promise(`${origin}/status.json`)).data.apiBaseURL); + r = await getClusterConfig((await Axios.get(`${origin}/status.json`)).data.apiBaseURL); if (r !== null) { return r; } @@ -76,15 +81,6 @@ const getRemoteHostInfo = async (remoteHost: 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) => { @@ -104,23 +100,17 @@ export const getSaltedToken = (clusterId: string, token: string) => { export const getActiveSession = (sessions: Session[]): Session | undefined => sessions.find(s => s.active); -export const validateCluster = async (info: RemoteHostInfo, useToken: string): +export const validateCluster = async (config: Config, useToken: string): Promise<{ user: User; token: string }> => { - const saltedToken = getSaltedToken(info.clusterId, useToken); - const user = await getUserDetails(info.baseUrl, saltedToken); + const saltedToken = getSaltedToken(config.uuidPrefix, useToken); + + 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, }; }; @@ -140,16 +130,17 @@ export const validateSession = (session: Session, activeSession: Session) => }; let fail: Error | null = null; - const info = await getRemoteHostInfo(session.remoteHost); - if (info !== null) { + const config = await getRemoteHostConfig(session.remoteHost); + if (config !== null) { + dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config })); try { - const { user, token } = await validateCluster(info, session.token); - setupSession(info.baseUrl, user, token); + const { user, token } = await validateCluster(config, session.token); + setupSession(config.baseUrl, user, token); } catch (e) { fail = new Error(`Getting current user for ${session.remoteHost}: ${e.message}`); try { - const { user, token } = await validateCluster(info, activeSession.token); - setupSession(info.baseUrl, user, token); + const { user, token } = await validateCluster(config, activeSession.token); + setupSession(config.baseUrl, user, token); fail = null; } catch (e2) { if (e.message === invalidV2Token) { @@ -197,7 +188,7 @@ export const validateSessions = () => } } } - services.authService.saveSessions(sessions); + services.authService.saveSessions(getState().auth.sessions); dispatch(progressIndicatorActions.STOP_WORKING("sessionsValidation")); } }; @@ -214,8 +205,8 @@ export const addSession = (remoteHost: string, token?: string, sendToLogin?: boo } if (useToken) { - const info = await getRemoteHostInfo(remoteHost); - if (!info) { + const config = await getRemoteHostConfig(remoteHost); + if (!config) { dispatch(snackbarActions.OPEN_SNACKBAR({ message: `Could not get config for ${remoteHost}`, kind: SnackbarKind.ERROR @@ -224,7 +215,8 @@ export const addSession = (remoteHost: string, token?: string, sendToLogin?: boo } try { - const { user, token } = await validateCluster(info, useToken); + dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config })); + const { user, token } = await validateCluster(config, useToken); const session = { loggedIn: true, status: SessionStatus.VALIDATED, @@ -232,23 +224,23 @@ export const addSession = (remoteHost: string, token?: string, sendToLogin?: boo email: user.email, name: getUserFullname(user), uuid: user.uuid, - baseUrl: info.baseUrl, - clusterId: info.clusterId, + baseUrl: config.baseUrl, + clusterId: config.uuidPrefix, remoteHost, token }; - if (sessions.find(s => s.clusterId === info.clusterId)) { - dispatch(authActions.UPDATE_SESSION(session)); + if (sessions.find(s => s.clusterId === config.uuidPrefix)) { + await dispatch(authActions.UPDATE_SESSION(session)); } else { - dispatch(authActions.ADD_SESSION(session)); + await dispatch(authActions.ADD_SESSION(session)); } services.authService.saveSessions(getState().auth.sessions); return session; } catch { if (sendToLogin) { - const rootUrl = new URL(info.baseUrl); + const rootUrl = new URL(config.baseUrl); rootUrl.pathname = ""; window.location.href = `${rootUrl.toString()}/login?return_to=` + encodeURI(`${window.location.protocol}//${window.location.host}/add-session?baseURL=` + encodeURI(rootUrl.toString())); return; @@ -295,7 +287,6 @@ 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()); };