X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f239b9e88677d82a48b6b565ab2fd407d1171729..f2b031de2183439f8aade2f290cd0e3f95f6438c:/src/store/auth/auth-reducer.ts?ds=sidebyside diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts index e3f968a8..a4195322 100644 --- a/src/store/auth/auth-reducer.ts +++ b/src/store/auth/auth-reducer.ts @@ -3,9 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0 import { authActions, AuthAction } from "./auth-action"; -import { User } from "../../models/user"; -import { ServiceRepository } from "../../services/services"; -import { removeServerApiAuthorizationHeader, setServerApiAuthorizationHeader } from "../../common/api/server-api"; +import { User } from "~/models/user"; +import { ServiceRepository } from "~/services/services"; export interface AuthState { user?: User; @@ -15,31 +14,18 @@ export interface AuthState { export const authReducer = (services: ServiceRepository) => (state: AuthState = {}, action: AuthAction) => { return authActions.match(action, { SAVE_API_TOKEN: (token: string) => { - services.authService.saveApiToken(token); - setServerApiAuthorizationHeader(token); return {...state, apiToken: token}; }, - INIT: () => { - const user = services.authService.getUser(); - const token = services.authService.getApiToken(); - if (token) { - setServerApiAuthorizationHeader(token); - } - return {user, apiToken: token}; + INIT: ({ user, token }) => { + return { user, apiToken: token }; }, LOGIN: () => { - services.authService.login(); return state; }, LOGOUT: () => { - services.authService.removeApiToken(); - services.authService.removeUser(); - removeServerApiAuthorizationHeader(); - services.authService.logout(); return {...state, apiToken: undefined}; }, USER_DETAILS_SUCCESS: (user: User) => { - services.authService.saveUser(user); return {...state, user}; }, default: () => state