Merge branch 'origin/master' into 14478-log-in-into-clusters

[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 c5a485648f40e49029aead8bbfc23222eb7718d2..a2822f100c37b6421b465f3b7a2312d2c5b00362 100644 (file)
--- a/src/store/auth/auth-reducer.ts
+++ b/src/store/auth/auth-reducer.ts
@@ -2,50 +2,72 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import actions, { AuthAction, UserDetailsResponse } from "./auth-action";
-import { User } from "../../models/user";
-import { authService } from "../../services/services";
-import { removeServerApiAuthorizationHeader, setServerApiAuthorizationHeader } from "../../common/server-api";
+import { authActions, AuthAction } from "./auth-action";
+import { User } from "~/models/user";
+import { ServiceRepository } from "~/services/services";
+import { SshKeyResource } from '~/models/ssh-key';
+import { Session } from "~/models/session";
 
 export interface AuthState {
     user?: User;
     apiToken?: string;
+    sshKeys: SshKeyResource[];
+    sessions: Session[];
+}
+
+const initialState: AuthState = {
+    user: undefined,
+    apiToken: undefined,
+    sshKeys: [],
+    sessions: []
 };
 
-const authReducer = (state: AuthState = {}, action: AuthAction) => {
-    return actions.match(action, {
+export const authReducer = (services: ServiceRepository) => (state = initialState, 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();
-            return {user, apiToken: token};
+        INIT: ({ user, token }) => {
+            return { ...state, 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};
         },
+        SET_SSH_KEYS: (sshKeys: SshKeyResource[]) => {
+            return {...state, sshKeys};
+        },
+        ADD_SSH_KEY: (sshKey: SshKeyResource) => {
+            return { ...state, sshKeys: state.sshKeys.concat(sshKey) };
+        },
+        REMOVE_SSH_KEY: (uuid: string) => {
+            return { ...state, sshKeys: state.sshKeys.filter((sshKey) => sshKey.uuid !== uuid )};
+        },
+        SET_SESSIONS: (sessions: Session[]) => {
+            return { ...state, sessions };
+        },
+        ADD_SESSION: (session: Session) => {
+            return { ...state, sessions: state.sessions.concat(session) };
+        },
+        REMOVE_SESSION: (clusterId: string) => {
+            return {
+                ...state,
+                sessions: state.sessions.filter(
+                    session => session.clusterId !== clusterId
+                )};
+        },
+        UPDATE_SESSION: (session: Session) => {
+            return {
+                ...state,
+                sessions: state.sessions.map(
+                    s => s.clusterId === session.clusterId ? session : s
+                )};
+        },
         default: () => state
     });
 };
-
-export default authReducer;