X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b6a5b173cd4e9f325f371d26204dfe156d911c20..3ec7057e490b3d19b15663dd312328f637fa1d3b:/src/store/auth/auth-reducer.ts diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts index 366385d5..e3f968a8 100644 --- a/src/store/auth/auth-reducer.ts +++ b/src/store/auth/auth-reducer.ts @@ -4,7 +4,7 @@ import { authActions, AuthAction } from "./auth-action"; import { User } from "../../models/user"; -import { authService } from "../../services/services"; +import { ServiceRepository } from "../../services/services"; import { removeServerApiAuthorizationHeader, setServerApiAuthorizationHeader } from "../../common/api/server-api"; export interface AuthState { @@ -12,34 +12,34 @@ export interface AuthState { apiToken?: string; } -export const authReducer = (state: AuthState = {}, action: AuthAction) => { +export const authReducer = (services: ServiceRepository) => (state: AuthState = {}, action: AuthAction) => { return authActions.match(action, { SAVE_API_TOKEN: (token: string) => { - authService.saveApiToken(token); + services.authService.saveApiToken(token); setServerApiAuthorizationHeader(token); return {...state, apiToken: token}; }, INIT: () => { - const user = authService.getUser(); - const token = authService.getApiToken(); + const user = services.authService.getUser(); + const token = services.authService.getApiToken(); if (token) { setServerApiAuthorizationHeader(token); } return {user, apiToken: token}; }, LOGIN: () => { - authService.login(); + services.authService.login(); return state; }, LOGOUT: () => { - authService.removeApiToken(); - authService.removeUser(); + services.authService.removeApiToken(); + services.authService.removeUser(); removeServerApiAuthorizationHeader(); - authService.logout(); + services.authService.logout(); return {...state, apiToken: undefined}; }, USER_DETAILS_SUCCESS: (user: User) => { - authService.saveUser(user); + services.authService.saveUser(user); return {...state, user}; }, default: () => state