SET_CONFIG: ofType<{ config: Config }>(),
SET_EXTRA_TOKEN: ofType<{ extraApiToken: string, extraApiTokenExpiration?: Date }>(),
RESET_EXTRA_TOKEN: {},
- INIT_USER: ofType<{ user: User, token: string, tokenExpiration?: Date }>(),
+ INIT_USER: ofType<{ user: User, token: string, tokenExpiration?: Date, tokenLocation?: string }>(),
USER_DETAILS_REQUEST: {},
USER_DETAILS_SUCCESS: ofType<User>(),
SET_SSH_KEYS: ofType<SshKeyResource[]>(),
// Cancel any link account ops in progress unless the user has
// just logged in or there has been a successful link operation
const data = services.linkAccountService.getLinkOpStatus();
- if (!matchTokenRoute(location.pathname) &&
- (!matchFedTokenRoute(location.pathname)) && data === undefined) {
+ if (!matchTokenRoute(window.location.pathname) &&
+ (!matchFedTokenRoute(window.location.pathname)) && data === undefined) {
await dispatch<any>(cancelLinking());
}
return dispatch<any>(init(config));
return state.remoteHostsConfig[state.localCluster];
};
+export const getLocalCluster = (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): string => {
+ return getState().auth.localCluster;
+};
+
export const saveApiToken = (token: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
let config: any;
const tokenParts = token.split('/');
const auth = getState().auth;
config = dispatch<any>(getConfig);
- // If federated token, get user & token data from the token issuing cluster
- if (tokenParts.length === 3 && tokenParts[1].substring(0, 5) !== auth.localCluster) {
- config = await getRemoteHostConfig(auth.remoteHosts[tokenParts[1].substring(0, 5)]);
+ // If the token is from a LoginCluster federation, get user & token data
+ // from the token issuing cluster.
+ if (!config) {
+ return;
+ }
+ const lc = (config as Config).loginCluster
+ const tokenCluster = tokenParts.length === 3
+ ? tokenParts[1].substring(0, 5)
+ : undefined;
+ if (tokenCluster && tokenCluster !== auth.localCluster &&
+ lc && lc === tokenCluster) {
+ config = await getRemoteHostConfig(auth.remoteHosts[tokenCluster]);
}
const svc = createServices(config, { progressFn: () => { }, errorFn: () => { } });
const user = await svc.authService.getUserDetails();
const client = await svc.apiClientAuthorizationService.get('current');
const tokenExpiration = client.expiresAt ? new Date(client.expiresAt) : undefined;
- dispatch(authActions.INIT_USER({ user, token, tokenExpiration }));
+ const tokenLocation = await svc.authService.getStorageType();
+ dispatch(authActions.INIT_USER({ user, token, tokenExpiration, tokenLocation }));
} catch (e) {
dispatch(authActions.LOGOUT({ deleteLinkData: false }));
}
const client = await svc.apiClientAuthorizationService.get('current');
dispatch(authActions.SET_EXTRA_TOKEN({
extraApiToken: extraToken,
- extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt): undefined,
+ extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt) : undefined,
}));
return extraToken;
} catch (e) {
const newExtraToken = getTokenV2(client);
dispatch(authActions.SET_EXTRA_TOKEN({
extraApiToken: newExtraToken,
- extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt): undefined,
+ extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt) : undefined,
}));
return newExtraToken;
} catch {