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 Axios, { AxiosInstance } from "axios";
+import { User, getUserDisplayName } from "~/models/user";
import { authActions } from "~/store/auth/auth-action";
import {
Config, ClusterConfigJSON, CLUSTER_CONFIG_PATH, DISCOVERY_DOC_PATH,
import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
import * as jsSHA from "jssha";
-const getClusterConfig = async (origin: string): Promise<Config | null> => {
- // Try the new public config endpoint
+const getClusterConfig = async (origin: string, apiClient: AxiosInstance): Promise<Config | null> => {
+ let configFromDD: Config | undefined;
try {
- const config = (await Axios.get<ClusterConfigJSON>(`${origin}/${CLUSTER_CONFIG_PATH}`)).data;
- return buildConfig(config);
- } catch { }
-
- // Fall back to discovery document
- try {
- const config = (await Axios.get<any>(`${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<any>(`${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<ClusterConfigJSON>(`${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<Config | null> => {
+const getRemoteHostConfig = async (remoteHost: string, useApiClient?: AxiosInstance): Promise<Config | null> => {
+ const apiClient = useApiClient || Axios.create({ headers: {} });
+
let url = remoteHost;
if (url.indexOf('://') < 0) {
url = 'https://' + url;
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<any>(`${origin}/config.json`)).data.API_HOST);
+ r = await getClusterConfig((await apiClient.get<any>(`${origin}/config.json`)).data.API_HOST, apiClient);
if (r !== null) {
return r;
}
// Maybe it is a Workbench1 URL, try getting status.json
try {
- r = await getClusterConfig((await Axios.get<any>(`${origin}/status.json`)).data.apiBaseURL);
+ r = await getClusterConfig((await apiClient.get<any>(`${origin}/status.json`)).data.apiBaseURL, apiClient);
if (r !== null) {
return r;
}
};
};
-export const validateSession = (session: Session, activeSession: Session) =>
+export const validateSession = (session: Session, activeSession: Session, useApiClient?: AxiosInstance) =>
async (dispatch: Dispatch): Promise<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.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) {
return session;
};
-export const validateSessions = () =>
+export const validateSessions = (useApiClient?: AxiosInstance) =>
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
const sessions = getState().auth.sessions;
const activeSession = getActiveSession(sessions);
override it using Dispatch<any>. 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,
}
};
+export const addRemoteConfig = (remoteHost: string) =>
+ async (dispatch: Dispatch<any>, 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<any>, getState: () => RootState, services: ServiceRepository) => {
const sessions = getState().auth.sessions;
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: Dispatch<any>) => {
const sessions = authService.buildSessions(config, user);
dispatch(authActions.SET_SESSIONS(sessions));
- dispatch(validateSessions());
+ dispatch(validateSessions(authService.getApiClient()));
};
export const loadSiteManagerPanel = () =>
projects / arvados-workbench2.git / blobdiff