X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eeb82d50816250cc6287928e6d958affa73880ee..3ec7057e490b3d19b15663dd312328f637fa1d3b:/src/store/auth/auth-reducer.ts

diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts
index 57a17ae5..e3f968a8 100644
--- a/src/store/auth/auth-reducer.ts
+++ b/src/store/auth/auth-reducer.ts
@@ -2,54 +2,46 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import actions, { AuthAction } from "./auth-action";
+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";
-import { UserDetailsResponse } from "../../services/auth-service/auth-service";
 
 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);
+            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: (ud: UserDetailsResponse) => {
-            const user = {
-                email: ud.email,
-                firstName: ud.first_name,
-                lastName: ud.last_name
-            };
-            authService.saveUser(user);
+        USER_DETAILS_SUCCESS: (user: User) => {
+            services.authService.saveUser(user);
             return {...state, user};
         },
         default: () => state
     });
 };
-
-export default authReducer;