X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/37e43f4e19ad2bd27b15fe7f0d857218dad39055..1826bc21a34b983778f6e221b6c4004fdea1ad1d:/src/store/auth/auth-action.ts diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index 9f429f05..baf80595 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -2,27 +2,40 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ofType, default as unionize, UnionOf } from "unionize"; +import { ofType, unionize, UnionOf } from '~/common/unionize'; import { Dispatch } from "redux"; -import { User } from "~/models/user"; +import { AxiosInstance } from "axios"; import { RootState } from "../store"; import { ServiceRepository } from "~/services/services"; -import { AxiosInstance } from "axios"; +import { SshKeyResource } from '~/models/ssh-key'; +import { User } from "~/models/user"; +import { Session } from "~/models/session"; +import { Config } from '~/common/config'; +import { initSessions } from "~/store/auth/auth-action-session"; export const authActions = unionize({ SAVE_API_TOKEN: ofType(), LOGIN: {}, LOGOUT: {}, + CONFIG: ofType<{ config: Config }>(), INIT: ofType<{ user: User, token: string }>(), USER_DETAILS_REQUEST: {}, - USER_DETAILS_SUCCESS: ofType() -}, { - tag: 'type', - value: 'payload' + USER_DETAILS_SUCCESS: ofType(), + SET_SSH_KEYS: ofType(), + ADD_SSH_KEY: ofType(), + REMOVE_SSH_KEY: ofType(), + SET_HOME_CLUSTER: ofType(), + SET_SESSIONS: ofType(), + ADD_SESSION: ofType(), + REMOVE_SESSION: ofType(), + UPDATE_SESSION: ofType() }); -function setAuthorizationHeader(client: AxiosInstance, token: string) { - client.defaults.headers.common = { +function setAuthorizationHeader(services: ServiceRepository, token: string) { + services.apiClient.defaults.headers.common = { + Authorization: `OAuth2 ${token}` + }; + services.webdavClient.defaults.headers = { Authorization: `OAuth2 ${token}` }; } @@ -31,25 +44,30 @@ function removeAuthorizationHeader(client: AxiosInstance) { delete client.defaults.headers.common.Authorization; } -export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const initAuth = (config: Config) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const user = services.authService.getUser(); const token = services.authService.getApiToken(); if (token) { - setAuthorizationHeader(services.apiClient, token); + setAuthorizationHeader(services, token); } + dispatch(authActions.CONFIG({ config })); if (token && user) { dispatch(authActions.INIT({ user, token })); + dispatch(initSessions(services.authService, config, user)); + dispatch(getUserDetails()).then((user: User) => { + dispatch(authActions.INIT({ user, token })); + }); } }; export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { services.authService.saveApiToken(token); - setAuthorizationHeader(services.apiClient, token); + setAuthorizationHeader(services, token); dispatch(authActions.SAVE_API_TOKEN(token)); }; -export const login = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - services.authService.login(); +export const login = (uuidPrefix: string, homeCluster: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + services.authService.login(uuidPrefix, homeCluster); dispatch(authActions.LOGIN()); };