projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15803: INIT->INIT_USER, CONFIG->SET_CONFIG, remove config reducer
[arvados.git]
/
src
/
store
/
auth
/
auth-reducer.ts
diff --git
a/src/store/auth/auth-reducer.ts
b/src/store/auth/auth-reducer.ts
index cded9f0e71816636ce1876d51c83d3976abb589c..946407fe24172610fbc3aaf9cff7b95052a43af8 100644
(file)
--- a/
src/store/auth/auth-reducer.ts
+++ b/
src/store/auth/auth-reducer.ts
@@
-3,11
+3,11
@@
// SPDX-License-Identifier: AGPL-3.0
import { authActions, AuthAction } from "./auth-action";
// SPDX-License-Identifier: AGPL-3.0
import { authActions, AuthAction } from "./auth-action";
-import { User
, UserResource
} from "~/models/user";
+import { User } from "~/models/user";
import { ServiceRepository } from "~/services/services";
import { SshKeyResource } from '~/models/ssh-key';
import { Session } from "~/models/session";
import { ServiceRepository } from "~/services/services";
import { SshKeyResource } from '~/models/ssh-key';
import { Session } from "~/models/session";
-import { Config } from '~/common/config';
+import { Config
, mockConfig
} from '~/common/config';
export interface AuthState {
user?: User;
export interface AuthState {
user?: User;
@@
-16,8
+16,10
@@
export interface AuthState {
sessions: Session[];
localCluster: string;
homeCluster: string;
sessions: Session[];
localCluster: string;
homeCluster: string;
+ loginCluster: string;
remoteHosts: { [key: string]: string };
remoteHostsConfig: { [key: string]: Config };
remoteHosts: { [key: string]: string };
remoteHostsConfig: { [key: string]: Config };
+ config: Config;
}
const initialState: AuthState = {
}
const initialState: AuthState = {
@@
-27,24
+29,23
@@
const initialState: AuthState = {
sessions: [],
localCluster: "",
homeCluster: "",
sessions: [],
localCluster: "",
homeCluster: "",
+ loginCluster: "",
remoteHosts: {},
remoteHosts: {},
- remoteHostsConfig: {}
+ remoteHostsConfig: {},
+ config: mockConfig({})
};
export const authReducer = (services: ServiceRepository) => (state = initialState, action: AuthAction) => {
return authActions.match(action, {
};
export const authReducer = (services: ServiceRepository) => (state = initialState, action: AuthAction) => {
return authActions.match(action, {
- SAVE_API_TOKEN: (token: string) => {
- return { ...state, apiToken: token };
- },
- SAVE_USER: (user: UserResource) => {
- return { ...state, user};
- },
- CONFIG: ({ config }) => {
+ SET_CONFIG: ({ config }) => {
return {
...state,
return {
...state,
+ config,
localCluster: config.uuidPrefix,
remoteHosts: { ...config.remoteHosts, [config.uuidPrefix]: new URL(config.rootUrl).host },
localCluster: config.uuidPrefix,
remoteHosts: { ...config.remoteHosts, [config.uuidPrefix]: new URL(config.rootUrl).host },
- homeCluster: config.uuidPrefix
+ homeCluster: config.loginCluster || config.uuidPrefix,
+ loginCluster: config.loginCluster,
+ remoteHostsConfig: { ...state.remoteHostsConfig, [config.uuidPrefix]: config }
};
},
REMOTE_CLUSTER_CONFIG: ({ config }) => {
};
},
REMOTE_CLUSTER_CONFIG: ({ config }) => {
@@
-53,7
+54,7
@@
export const authReducer = (services: ServiceRepository) => (state = initialStat
remoteHostsConfig: { ...state.remoteHostsConfig, [config.uuidPrefix]: config },
};
},
remoteHostsConfig: { ...state.remoteHostsConfig, [config.uuidPrefix]: config },
};
},
- INIT: ({ user, token }) => {
+ INIT
_USER
: ({ user, token }) => {
return { ...state, user, apiToken: token, homeCluster: user.uuid.substr(0, 5) };
},
LOGIN: () => {
return { ...state, user, apiToken: token, homeCluster: user.uuid.substr(0, 5) };
},
LOGIN: () => {
@@
-63,7
+64,7
@@
export const authReducer = (services: ServiceRepository) => (state = initialStat
return { ...state, apiToken: undefined };
},
USER_DETAILS_SUCCESS: (user: User) => {
return { ...state, apiToken: undefined };
},
USER_DETAILS_SUCCESS: (user: User) => {
- return { ...state, user };
+ return { ...state, user
, homeCluster: user.uuid.substr(0, 5)
};
},
SET_SSH_KEYS: (sshKeys: SshKeyResource[]) => {
return { ...state, sshKeys };
},
SET_SSH_KEYS: (sshKeys: SshKeyResource[]) => {
return { ...state, sshKeys };