Merge branch 'master' into 14039-details-view-improvements

[arvados-workbench2.git] / src / store / auth / auth-reducer.ts

diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts
index 3fad4cf7569019b3ecbc1ed0d7b8d047e5f2c219..a4195322c867316ce201f8d03ea4c28bffd25825 100644 (file)
--- a/src/store/auth/auth-reducer.ts
+++ b/src/store/auth/auth-reducer.ts
@@ -2,54 +2,32 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import actions, { AuthAction } from "./auth-action";
-import { User } from "../../models/user";
-import { authService } from "../../services/services";
-import { removeServerApiAuthorizationHeader, setServerApiAuthorizationHeader } from "../../common/server-api";
-import { UserDetailsResponse } from "../../services/auth-service/auth-service";
+import { authActions, AuthAction } from "./auth-action";
+import { User } from "~/models/user";
+import { ServiceRepository } from "~/services/services";
 
 export interface AuthState {
     user?: User;
     apiToken?: string;
-};
+}
 
-const authReducer = (state: AuthState = {}, action: AuthAction) => {
-    return actions.match(action, {
+export const authReducer = (services: ServiceRepository) => (state: AuthState = {}, action: AuthAction) => {
+    return authActions.match(action, {
         SAVE_API_TOKEN: (token: string) => {
-            authService.saveApiToken(token);
-            setServerApiAuthorizationHeader(token);
             return {...state, apiToken: token};
         },
-        INIT: () => {
-            const user = authService.getUser();
-            const token = authService.getApiToken();
-            if (token) {
-                setServerApiAuthorizationHeader(token);
-            }
-            return {user, apiToken: token};
+        INIT: ({ user, token }) => {
+            return { user, apiToken: token };
         },
         LOGIN: () => {
-            authService.login();
             return state;
         },
         LOGOUT: () => {
-            authService.removeApiToken();
-            authService.removeUser();
-            removeServerApiAuthorizationHeader();
-            authService.logout();
             return {...state, apiToken: undefined};
         },
-        USER_DETAILS_SUCCESS: (ud: UserDetailsResponse) => {
-            const user = {
-                email: ud.email,
-                firstName: ud.first_name,
-                lastName: ud.last_name
-            };
-            authService.saveUser(user);
+        USER_DETAILS_SUCCESS: (user: User) => {
             return {...state, user};
         },
         default: () => state
     });
 };
-
-export default authReducer;