packageVersion: string;
parameters: {};
protocol: string;
- remoteHosts: string;
+ remoteHosts: {
+ [key: string]: string
+ };
remoteHostsViaDNS: boolean;
resources: {};
revision: string;
websocketUrl: string;
workbenchUrl: string;
vocabularyUrl: string;
+ origin: string;
}
export const fetchConfig = () => {
.catch(() => Promise.resolve(getDefaultConfig()))
.then(config => Axios
.get<Config>(getDiscoveryURL(config.API_HOST))
- .then(response => ({
+ .then(response => ({
// TODO: After tests delete `|| '/vocabulary-example.json'`
- config: {...response.data, vocabularyUrl: config.VOCABULARY_URL || '/vocabulary-example.json' },
- apiHost: config.API_HOST,
+ config: {...response.data, vocabularyUrl: config.VOCABULARY_URL || '/vocabulary-example.json' },
+ apiHost: config.API_HOST,
})));
};
packageVersion: '',
parameters: {},
protocol: '',
- remoteHosts: '',
+ remoteHosts: {},
remoteHostsViaDNS: false,
resources: {},
revision: '',
websocketUrl: '',
workbenchUrl: '',
vocabularyUrl: '',
+ origin: '',
...config
});
VOCABULARY_URL: "",
});
-const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/discovery/v1/apis/arvados/v1/rest`;
+export const DISCOVERY_URL = 'discovery/v1/apis/arvados/v1/rest';
+const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/${DISCOVERY_URL}`;
import * as React from 'react';
import { WrappedFieldProps } from 'redux-form';
import { ArvadosTheme } from '~/common/custom-theme';
-import { TextField as MaterialTextField, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import {
+ TextField as MaterialTextField,
+ StyleRulesCallback,
+ WithStyles,
+ withStyles,
+ PropTypes
+} from '@material-ui/core';
import RichTextEditor from 'react-rte';
+import Margin = PropTypes.Margin;
type CssRules = 'textField';
type TextFieldProps = WrappedFieldProps & WithStyles<CssRules>;
-export const TextField = withStyles(styles)((props: TextFieldProps & {
- label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, children: React.ReactNode
+export const TextField = withStyles(styles)((props: TextFieldProps & {
+ label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, children: React.ReactNode, margin?: Margin
}) =>
<MaterialTextField
helperText={props.meta.touched && props.meta.error}
required={props.required}
select={props.select}
children={props.children}
+ margin={props.margin}
{...props.input}
/>);
onChange={props.input.onChange}
value={props.input.value}
/>
- );
\ No newline at end of file
+ );
const store = configureStore(history, services);
store.subscribe(initListener(history, store, services, config));
- store.dispatch(initAuth());
+ store.dispatch(initAuth(config));
store.dispatch(setBuildInfo());
store.dispatch(setCurrentTokenDialogApiHost(apiHost));
store.dispatch(setUuidPrefix(config.uuidPrefix));
--- /dev/null
+export interface ClientAuthorizationResource {
+ uuid: string;
+ apiToken: string;
+ apiClientId: number;
+ userId: number;
+ createdByIpAddress: string;
+ lastUsedByIpAddress: string;
+ lastUsedAt: string;
+ expiresAt: string;
+ ownerUuid: string;
+ scopes: string[];
+}
--- /dev/null
+export interface Session {
+ clusterId: string;
+ remoteHost: string;
+ username: string;
+ email: string;
+ token: string;
+ loggedIn: boolean;
+ validated: boolean;
+}
const virtualMachineMatch = Routes.matchVirtualMachineRoute(pathname);
const workflowMatch = Routes.matchWorkflowRoute(pathname);
const sshKeysMatch = Routes.matchSshKeysRoute(pathname);
+ const siteManagerMatch = Routes.matchSiteManagerRoute(pathname);
const keepServicesMatch = Routes.matchKeepServicesRoute(pathname);
const computeNodesMatch = Routes.matchComputeNodesRoute(pathname);
store.dispatch(WorkbenchActions.loadRepositories);
} else if (sshKeysMatch) {
store.dispatch(WorkbenchActions.loadSshKeys);
+ } else if (siteManagerMatch) {
+ store.dispatch(WorkbenchActions.loadSiteManager);
} else if (keepServicesMatch) {
store.dispatch(WorkbenchActions.loadKeepServices);
} else if (computeNodesMatch) {
WORKFLOWS: '/workflows',
SEARCH_RESULTS: '/search-results',
SSH_KEYS: `/ssh-keys`,
+ SITE_MANAGER: `/site-manager`,
KEEP_SERVICES: `/keep-services`,
COMPUTE_NODES: `/nodes`
};
export const matchVirtualMachineRoute = (route: string) =>
matchPath<ResourceRouteParams>(route, { path: Routes.VIRTUAL_MACHINES });
-
+
export const matchRepositoriesRoute = (route: string) =>
matchPath<ResourceRouteParams>(route, { path: Routes.REPOSITORIES });
-
+
export const matchSshKeysRoute = (route: string) =>
matchPath(route, { path: Routes.SSH_KEYS });
+export const matchSiteManagerRoute = (route: string) =>
+ matchPath(route, { path: Routes.SITE_MANAGER });
+
export const matchKeepServicesRoute = (route: string) =>
matchPath(route, { path: Routes.KEEP_SERVICES });
export const matchComputeNodesRoute = (route: string) =>
- matchPath(route, { path: Routes.COMPUTE_NODES });
\ No newline at end of file
+ matchPath(route, { path: Routes.COMPUTE_NODES });
//
// SPDX-License-Identifier: AGPL-3.0
-import { User } from "~/models/user";
+import { getUserFullname, User } from "~/models/user";
import { AxiosInstance } from "axios";
import { ApiActions } from "~/services/api/api-actions";
import * as uuid from "uuid/v4";
+import { Session } from "~/models/session";
+import { Config } from "~/common/config";
+import { merge, uniqWith, uniqBy } from "lodash";
export const API_TOKEN_KEY = 'apiToken';
export const USER_EMAIL_KEY = 'userEmail';
const lastName = localStorage.getItem(USER_LAST_NAME_KEY);
const uuid = this.getUuid();
const ownerUuid = this.getOwnerUuid();
- const isAdmin = this.getIsAdmin();
+ const isAdmin = this.getIsAdmin();
return email && firstName && lastName && uuid && ownerUuid
? { email, firstName, lastName, uuid, ownerUuid, isAdmin }
const uuidParts = uuid ? uuid.split('-') : [];
return uuidParts.length > 1 ? `${uuidParts[0]}-${uuidParts[1]}` : undefined;
}
+
+ public getSessions(): Session[] {
+ try {
+ const sessions = JSON.parse(localStorage.getItem("sessions") || '');
+ return sessions;
+ } catch {
+ return [];
+ }
+ }
+
+ public saveSessions(sessions: Session[]) {
+ localStorage.setItem("sessions", JSON.stringify(sessions));
+ }
+
+ public buildSessions(cfg: Config, user?: User) {
+ const currentSession = {
+ clusterId: cfg.uuidPrefix,
+ remoteHost: cfg.baseUrl,
+ username: getUserFullname(user),
+ email: user ? user.email : '',
+ token: this.getApiToken(),
+ loggedIn: true
+ } as Session;
+ const localSessions = this.getSessions();
+ const cfgSessions = Object.keys(cfg.remoteHosts).map(clusterId => {
+ const remoteHost = cfg.remoteHosts[clusterId];
+ return {
+ clusterId,
+ remoteHost,
+ username: '',
+ email: '',
+ token: '',
+ loggedIn: false
+ } as Session;
+ });
+ const sessions = [currentSession]
+ .concat(cfgSessions)
+ .concat(localSessions);
+
+ const uniqSessions = uniqBy(sessions, 'clusterId');
+
+ return uniqSessions;
+ }
}
--- /dev/null
+import { CommonResourceService } from "~/services/common-service/common-resource-service";
+import { AxiosInstance } from "axios";
+import { ApiActions } from "~/services/api/api-actions";
+import { ClientAuthorizationResource } from "~/models/client-authorization";
+
+export class ClientAuthorizationsService extends CommonResourceService<ClientAuthorizationResource> {
+ constructor(serverApi: AxiosInstance, actions: ApiActions) {
+ super(serverApi, "api_client_authorizations", actions);
+ }
+}
+//
+// "{"9tee4":{"user":{"href":"/users/c97qk-tpzed-h733ef2x1ux1xig","kind":"arvados#user","etag":"71xgfqki00pfo7kc5mnnqtef0","uuid":"c97qk-tpzed-h733ef2x1ux1xig","owner_uuid":"9tee4-tpzed-000000000000000","created_at":"2018-11-21T08:19:20.215298180Z","modified_by_client_uuid":null,"modified_by_user_uuid":"9tee4-tpzed-000000000000000","modified_at":"2018-11-21T08:19:20.437345000Z","email":"unodgs@gmail.com","username":"unodgs","full_name":"Daniel Kos","first_name":"Daniel","last_name":"Kos","identity_url":null,"is_active":true,"is_admin":false,"is_invited":true,"prefs":{"profile":{"organization":"Digital Software","organization_email":"unodgs@gmail.com","lab":"","website_url":"","role":"Software Developer"}},"writable_by":["9tee4-tpzed-000000000000000","c97qk-tpzed-h733ef2x1ux1xig","9tee4-j7d0g-000000000000000"]},"baseURL":"https://9tee4.arvadosapi.com/","token":"v2/c97qk-gj3su-5c8sbdggl81a66k/deeb5637ae08f44a7856abdf53a7c037bdcbe7a6","listedHost":true},"4xphq":{"user":{"href":"/users/c97qk-tpzed-h733ef2x1ux1xig","kind":"arvados#user","etag":"7fivqub7mwmf0fhky6dqr27nx","uuid":"c97qk-tpzed-h733ef2x1ux1xig","owner_uuid":"4xphq-tpzed-000000000000000","created_at":"2018-11-21T08:19:23.000623836Z","modified_by_client_uuid":null,"modified_by_user_uuid":"4xphq-tpzed-000000000000000","modified_at":"2018-11-21T08:19:24.615112000Z","email":"unodgs@gmail.com","username":"unodgs2","full_name":"Daniel Kos","first_name":"Daniel","last_name":"Kos","identity_url":null,"is_active":true,"is_admin":false,"is_invited":true,"prefs":{"profile":{"organization":"Digital Software","organization_email":"unodgs@gmail.com","lab":"","website_url":"","role":"Software Developer"}},"writable_by":["4xphq-tpzed-000000000000000","c97qk-tpzed-h733ef2x1ux1xig","4xphq-j7d0g-000000000000000"]},"baseURL":"https://4xphq.arvadosapi.com/","token":"v2/c97qk-gj3su-5c8sbdggl81a66k/988337de59eb9ea3f484df0b92ca6b6502a77985","listedHost":true}}"
import * as _ from "lodash";
import { AxiosInstance, AxiosPromise } from "axios";
-import { Resource } from "src/models/resource";
import * as uuid from "uuid/v4";
import { ApiActions } from "~/services/api/api-actions";
NONE = 'None'
}
-export class CommonResourceService<T extends Resource> {
+export class CommonResourceService<T> {
static mapResponseKeys = (response: { data: any }) =>
CommonResourceService.mapKeys(_.camelCase)(response.data)
import { AuthorizedKeysService } from '~/services/authorized-keys-service/authorized-keys-service';
import { VocabularyService } from '~/services/vocabulary-service/vocabulary-service';
import { NodeService } from '~/services/node-service/node-service';
+import { ClientAuthorizationsService } from "~/services/client-authorizations-service/client-authorizations-service";
export type ServiceRepository = ReturnType<typeof createServices>;
webdavClient.defaults.baseURL = config.keepWebServiceUrl;
const authorizedKeysService = new AuthorizedKeysService(apiClient, actions);
+ const clientAuthorizationsService = new ClientAuthorizationsService(apiClient, actions);
const containerRequestService = new ContainerRequestService(apiClient, actions);
const containerService = new ContainerService(apiClient, actions);
const groupsService = new GroupsService(apiClient, actions);
apiClient,
authService,
authorizedKeysService,
+ clientAuthorizationsService,
collectionFilesService,
collectionService,
containerRequestService,
--- /dev/null
+import { Dispatch } from "redux";
+import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions";
+import { RootState } from "~/store/store";
+import { ServiceRepository } from "~/services/services";
+import Axios from "axios";
+import { getUserFullname } from "~/models/user";
+import { authActions } from "~/store/auth/auth-action";
+import { Config, DISCOVERY_URL } from "~/common/config";
+import { Session } from "~/models/session";
+import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
+import { UserDetailsResponse } from "~/services/auth-service/auth-service";
+
+
+const getSessionOrigin = async (session: Session) => {
+ let url = session.remoteHost;
+ if (url.indexOf('://') < 0) {
+ url = 'https://' + url;
+ }
+ const origin = new URL(url).origin;
+ try {
+ const resp = await Axios.get<Config>(`${origin}/${DISCOVERY_URL}`);
+ return resp.data.origin;
+ } catch (err) {
+ try {
+ const resp = await Axios.get<any>(`${origin}/status.json`);
+ return resp.data.apiBaseURL;
+ } catch (err) {
+ }
+ }
+ return null;
+};
+
+const getUserDetails = async (origin: string, token: string): Promise<UserDetailsResponse> => {
+ const resp = await Axios.get<UserDetailsResponse>(`${origin}/arvados/v1/users/current`, {
+ headers: {
+ Authorization: `OAuth2 ${token}`
+ }
+ });
+ return resp.data;
+};
+
+const validateSessions = () =>
+ async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ const sessions = getState().auth.sessions;
+ dispatch(progressIndicatorActions.START_WORKING("sessionsValidation"));
+ for (const session of sessions) {
+ if (!session.validated) {
+ const origin = await getSessionOrigin(session);
+ const user = await getUserDetails(origin, session.token);
+ }
+ }
+ dispatch(progressIndicatorActions.STOP_WORKING("sessionsValidation"));
+ };
+
+export const addSession = (remoteHost: string) =>
+ (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const user = getState().auth.user!;
+ const clusterId = remoteHost.match(/^(\w+)\./)![1];
+
+ dispatch(authActions.ADD_SESSION({
+ loggedIn: false,
+ validated: false,
+ email: user.email,
+ username: getUserFullname(user),
+ remoteHost,
+ clusterId,
+ token: ''
+ }));
+
+ services.authService.saveSessions(getState().auth.sessions);
+ };
+
+export const loadSiteManagerPanel = () =>
+ async (dispatch: Dispatch<any>) => {
+ try {
+ dispatch(setBreadcrumbs([{ label: 'Site Manager'}]));
+ dispatch(validateSessions());
+ } catch (e) {
+ return;
+ }
+ };
--- /dev/null
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { Dispatch } from "redux";
+import { RootState } from "~/store/store";
+import { ServiceRepository } from "~/services/services";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
+import { FormErrors, reset, startSubmit, stopSubmit } from "redux-form";
+import { KeyType } from "~/models/ssh-key";
+import {
+ AuthorizedKeysServiceError,
+ getAuthorizedKeysServiceError
+} from "~/services/authorized-keys-service/authorized-keys-service";
+import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions";
+import {
+ authActions,
+} from "~/store/auth/auth-action";
+
+export const SSH_KEY_CREATE_FORM_NAME = 'sshKeyCreateFormName';
+export const SSH_KEY_PUBLIC_KEY_DIALOG = 'sshKeyPublicKeyDialog';
+export const SSH_KEY_REMOVE_DIALOG = 'sshKeyRemoveDialog';
+export const SSH_KEY_ATTRIBUTES_DIALOG = 'sshKeyAttributesDialog';
+
+export interface SshKeyCreateFormDialogData {
+ publicKey: string;
+ name: string;
+}
+
+export const openSshKeyCreateDialog = () => dialogActions.OPEN_DIALOG({ id: SSH_KEY_CREATE_FORM_NAME, data: {} });
+
+export const openPublicKeyDialog = (name: string, publicKey: string) =>
+ dialogActions.OPEN_DIALOG({ id: SSH_KEY_PUBLIC_KEY_DIALOG, data: { name, publicKey } });
+
+export const openSshKeyAttributesDialog = (uuid: string) =>
+ (dispatch: Dispatch, getState: () => RootState) => {
+ const sshKey = getState().auth.sshKeys.find(it => it.uuid === uuid);
+ dispatch(dialogActions.OPEN_DIALOG({ id: SSH_KEY_ATTRIBUTES_DIALOG, data: { sshKey } }));
+ };
+
+export const openSshKeyRemoveDialog = (uuid: string) =>
+ (dispatch: Dispatch, getState: () => RootState) => {
+ dispatch(dialogActions.OPEN_DIALOG({
+ id: SSH_KEY_REMOVE_DIALOG,
+ data: {
+ title: 'Remove public key',
+ text: 'Are you sure you want to remove this public key?',
+ confirmButtonLabel: 'Remove',
+ uuid
+ }
+ }));
+ };
+
+export const removeSshKey = (uuid: string) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...' }));
+ await services.authorizedKeysService.delete(uuid);
+ dispatch(authActions.REMOVE_SSH_KEY(uuid));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Public Key has been successfully removed.', hideDuration: 2000 }));
+ };
+
+export const createSshKey = (data: SshKeyCreateFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const userUuid = getState().auth.user!.uuid;
+ const { name, publicKey } = data;
+ dispatch(startSubmit(SSH_KEY_CREATE_FORM_NAME));
+ try {
+ const newSshKey = await services.authorizedKeysService.create({
+ name,
+ publicKey,
+ keyType: KeyType.SSH,
+ authorizedUserUuid: userUuid
+ });
+ dispatch(authActions.ADD_SSH_KEY(newSshKey));
+ dispatch(dialogActions.CLOSE_DIALOG({ id: SSH_KEY_CREATE_FORM_NAME }));
+ dispatch(reset(SSH_KEY_CREATE_FORM_NAME));
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: "Public key has been successfully created.",
+ hideDuration: 2000
+ }));
+ } catch (e) {
+ const error = getAuthorizedKeysServiceError(e);
+ if (error === AuthorizedKeysServiceError.UNIQUE_PUBLIC_KEY) {
+ dispatch(stopSubmit(SSH_KEY_CREATE_FORM_NAME, { publicKey: 'Public key already exists.' } as FormErrors));
+ } else if (error === AuthorizedKeysServiceError.INVALID_PUBLIC_KEY) {
+ dispatch(stopSubmit(SSH_KEY_CREATE_FORM_NAME, { publicKey: 'Public key is invalid' } as FormErrors));
+ }
+ }
+ };
+
+export const loadSshKeysPanel = () =>
+ async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ dispatch(setBreadcrumbs([{ label: 'SSH Keys'}]));
+ const response = await services.authorizedKeysService.list();
+ dispatch(authActions.SET_SSH_KEYS(response.items));
+ } catch (e) {
+ return;
+ }
+ };
+
import { createServices } from "~/services/services";
import { configureStore, RootStore } from "../store";
import createBrowserHistory from "history/createBrowserHistory";
-import { mockConfig } from '~/common/config';
+import { Config, mockConfig } from '~/common/config';
import { ApiActions } from "~/services/api/api-actions";
describe('auth-actions', () => {
localStorage.setItem(USER_OWNER_UUID_KEY, "ownerUuid");
localStorage.setItem(USER_IS_ADMIN, JSON.stringify("false"));
- store.dispatch(initAuth());
+ const config: any = {
+ remoteHosts: { "xc59": "xc59.api.arvados.com" }
+ };
+
+ store.dispatch(initAuth(config));
expect(store.getState().auth).toEqual({
apiToken: "token",
import { ofType, unionize, UnionOf } from '~/common/unionize';
import { Dispatch } from "redux";
-import { reset, stopSubmit, startSubmit, FormErrors } from 'redux-form';
import { AxiosInstance } from "axios";
import { RootState } from "../store";
-import { snackbarActions } from '~/store/snackbar/snackbar-actions';
-import { dialogActions } from '~/store/dialog/dialog-actions';
-import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
import { ServiceRepository } from "~/services/services";
-import { getAuthorizedKeysServiceError, AuthorizedKeysServiceError } from '~/services/authorized-keys-service/authorized-keys-service';
-import { KeyType, SshKeyResource } from '~/models/ssh-key';
+import { SshKeyResource } from '~/models/ssh-key';
import { User } from "~/models/user";
+import { Session } from "~/models/session";
+import { Config } from '~/common/config';
export const authActions = unionize({
SAVE_API_TOKEN: ofType<string>(),
USER_DETAILS_SUCCESS: ofType<User>(),
SET_SSH_KEYS: ofType<SshKeyResource[]>(),
ADD_SSH_KEY: ofType<SshKeyResource>(),
- REMOVE_SSH_KEY: ofType<string>()
+ REMOVE_SSH_KEY: ofType<string>(),
+ SET_SESSIONS: ofType<Session[]>(),
+ ADD_SESSION: ofType<Session>(),
+ REMOVE_SESSION: ofType<string>()
});
-export const SSH_KEY_CREATE_FORM_NAME = 'sshKeyCreateFormName';
-export const SSH_KEY_PUBLIC_KEY_DIALOG = 'sshKeyPublicKeyDialog';
-export const SSH_KEY_REMOVE_DIALOG = 'sshKeyRemoveDialog';
-export const SSH_KEY_ATTRIBUTES_DIALOG = 'sshKeyAttributesDialog';
-
-export interface SshKeyCreateFormDialogData {
- publicKey: string;
- name: string;
-}
-
function setAuthorizationHeader(services: ServiceRepository, token: string) {
services.apiClient.defaults.headers.common = {
Authorization: `OAuth2 ${token}`
delete client.defaults.headers.common.Authorization;
}
-export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+export const initAuth = (config: Config) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const user = services.authService.getUser();
const token = services.authService.getApiToken();
if (token) {
if (token && user) {
dispatch(authActions.INIT({ user, token }));
}
+ const sessions = services.authService.buildSessions(config, user);
+ services.authService.saveSessions(sessions);
+ dispatch(authActions.SET_SESSIONS(sessions));
};
export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
});
};
-export const openSshKeyCreateDialog = () => dialogActions.OPEN_DIALOG({ id: SSH_KEY_CREATE_FORM_NAME, data: {} });
-
-export const openPublicKeyDialog = (name: string, publicKey: string) =>
- dialogActions.OPEN_DIALOG({ id: SSH_KEY_PUBLIC_KEY_DIALOG, data: { name, publicKey } });
-
-export const openSshKeyAttributesDialog = (uuid: string) =>
- (dispatch: Dispatch, getState: () => RootState) => {
- const sshKey = getState().auth.sshKeys.find(it => it.uuid === uuid);
- dispatch(dialogActions.OPEN_DIALOG({ id: SSH_KEY_ATTRIBUTES_DIALOG, data: { sshKey } }));
- };
-
-export const openSshKeyRemoveDialog = (uuid: string) =>
- (dispatch: Dispatch, getState: () => RootState) => {
- dispatch(dialogActions.OPEN_DIALOG({
- id: SSH_KEY_REMOVE_DIALOG,
- data: {
- title: 'Remove public key',
- text: 'Are you sure you want to remove this public key?',
- confirmButtonLabel: 'Remove',
- uuid
- }
- }));
- };
-
-export const removeSshKey = (uuid: string) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...' }));
- await services.authorizedKeysService.delete(uuid);
- dispatch(authActions.REMOVE_SSH_KEY(uuid));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Public Key has been successfully removed.', hideDuration: 2000 }));
- };
-
-export const createSshKey = (data: SshKeyCreateFormDialogData) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const userUuid = getState().auth.user!.uuid;
- const { name, publicKey } = data;
- dispatch(startSubmit(SSH_KEY_CREATE_FORM_NAME));
- try {
- const newSshKey = await services.authorizedKeysService.create({
- name,
- publicKey,
- keyType: KeyType.SSH,
- authorizedUserUuid: userUuid
- });
- dispatch(authActions.ADD_SSH_KEY(newSshKey));
- dispatch(dialogActions.CLOSE_DIALOG({ id: SSH_KEY_CREATE_FORM_NAME }));
- dispatch(reset(SSH_KEY_CREATE_FORM_NAME));
- dispatch(snackbarActions.OPEN_SNACKBAR({
- message: "Public key has been successfully created.",
- hideDuration: 2000
- }));
- } catch (e) {
- const error = getAuthorizedKeysServiceError(e);
- if (error === AuthorizedKeysServiceError.UNIQUE_PUBLIC_KEY) {
- dispatch(stopSubmit(SSH_KEY_CREATE_FORM_NAME, { publicKey: 'Public key already exists.' } as FormErrors));
- } else if (error === AuthorizedKeysServiceError.INVALID_PUBLIC_KEY) {
- dispatch(stopSubmit(SSH_KEY_CREATE_FORM_NAME, { publicKey: 'Public key is invalid' } as FormErrors));
- }
- }
- };
-
-export const loadSshKeysPanel = () =>
- async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
- try {
- dispatch(setBreadcrumbs([{ label: 'SSH Keys'}]));
- const response = await services.authorizedKeysService.list();
- dispatch(authActions.SET_SSH_KEYS(response.items));
- } catch (e) {
- return;
- }
- };
-
-
export type AuthAction = UnionOf<typeof authActions>;
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: []
+ sshKeys: [],
+ sessions: []
};
export const authReducer = (services: ServiceRepository) => (state = initialState, action: AuthAction) => {
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
+ )};
+ },
default: () => state
});
};
export const navigateToSshKeys= push(Routes.SSH_KEYS);
+export const navigateToSiteManager= push(Routes.SITE_MANAGER);
+
export const navigateToKeepServices = push(Routes.KEEP_SERVICES);
-export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
\ No newline at end of file
+export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
import { loadSharedWithMePanel } from '~/store/shared-with-me-panel/shared-with-me-panel-actions';
import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
import { loadWorkflowPanel, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions';
-import { loadSshKeysPanel } from '~/store/auth/auth-action';
+import { loadSshKeysPanel } from '~/store/auth/auth-action-ssh';
+import { loadSiteManagerPanel } from '~/store/auth/auth-action-session';
import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
import { getProgressIndicator } from '~/store/progress-indicator/progress-indicator-reducer';
await dispatch(loadVirtualMachinesPanel());
dispatch(setBreadcrumbs([{ label: 'Virtual Machines' }]));
});
-
+
export const loadRepositories = handleFirstTimeLoad(
async (dispatch: Dispatch<any>) => {
await dispatch(loadRepositoriesPanel());
await dispatch(loadSshKeysPanel());
});
+export const loadSiteManager = handleFirstTimeLoad(
+ async (dispatch: Dispatch<any>) => {
+ await dispatch(loadSiteManagerPanel());
+ });
+
export const loadKeepServices = handleFirstTimeLoad(
async (dispatch: Dispatch<any>) => {
await dispatch(loadKeepServicesPanel());
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+
+const ERROR_MESSAGE = 'Remote host is invalid';
+
+export const isRemoteHost = (value: string) => {
+ return value.match(/\w+\.\w+\.\w+/i) ? undefined : ERROR_MESSAGE;
+};
import { require } from './require';
import { maxLength } from './max-length';
import { isRsaKey } from './is-rsa-key';
+import { isRemoteHost } from "./is-remote-host";
export const TAG_KEY_VALIDATION = [require, maxLength(255)];
export const TAG_VALUE_VALIDATION = [require, maxLength(255)];
export const SSH_KEY_PUBLIC_VALIDATION = [require, isRsaKey, maxLength(1024)];
export const SSH_KEY_NAME_VALIDATION = [require, maxLength(255)];
+
+export const SITE_MANAGER_REMOTE_HOST_VALIDATION = [require, isRemoteHost, maxLength(255)];
import { ContextMenuActionSet } from "~/views-components/context-menu/context-menu-action-set";
import { AdvancedIcon, RemoveIcon, AttributesIcon } from "~/components/icon/icon";
-import { openSshKeyRemoveDialog, openSshKeyAttributesDialog } from '~/store/auth/auth-action';
+import { openSshKeyRemoveDialog, openSshKeyAttributesDialog } from '~/store/auth/auth-action-ssh';
import { openAdvancedTabDialog } from '~/store/advanced-tab/advanced-tab';
export const sshKeyActionSet: ContextMenuActionSet = [[{
import { WithDialogProps } from '~/store/dialog/with-dialog';
import { FormDialog } from '~/components/form-dialog/form-dialog';
import { SshKeyPublicField, SshKeyNameField } from '~/views-components/form-fields/ssh-key-form-fields';
-import { SshKeyCreateFormDialogData } from '~/store/auth/auth-action';
+import { SshKeyCreateFormDialogData } from '~/store/auth/auth-action-ssh';
type DialogSshKeyProps = WithDialogProps<{}> & InjectedFormProps<SshKeyCreateFormDialogData>;
import { compose } from "redux";
import { reduxForm } from 'redux-form';
import { withDialog } from "~/store/dialog/with-dialog";
-import { SSH_KEY_CREATE_FORM_NAME, createSshKey, SshKeyCreateFormDialogData } from '~/store/auth/auth-action';
+import {
+ SSH_KEY_CREATE_FORM_NAME,
+ createSshKey,
+ SshKeyCreateFormDialogData
+} from '~/store/auth/auth-action-ssh';
import { DialogSshKeyCreate } from '~/views-components/dialog-create/dialog-ssh-key-create';
export const CreateSshKeyDialog = compose(
dispatch(createSshKey(data));
}
})
-)(DialogSshKeyCreate);
\ No newline at end of file
+)(DialogSshKeyCreate);
import { RootState } from "~/store/store";
import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions';
import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
-import { navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes } from '~/store/navigation/navigation-action';
+import {
+ navigateToSshKeys,
+ navigateToKeepServices,
+ navigateToComputeNodes,
+ navigateToSiteManager
+} from '~/store/navigation/navigation-action';
import { openVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions";
interface AccountMenuProps {
<MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
<MenuItem onClick={() => dispatch(openCurrentTokenDialog)}>Current token</MenuItem>
<MenuItem onClick={() => dispatch(navigateToSshKeys)}>Ssh Keys</MenuItem>
+ <MenuItem onClick={() => dispatch(navigateToSiteManager)}>Site Manager</MenuItem>
{ user.isAdmin && <MenuItem onClick={() => dispatch(navigateToKeepServices)}>Keep Services</MenuItem> }
{ user.isAdmin && <MenuItem onClick={() => dispatch(navigateToComputeNodes)}>Compute Nodes</MenuItem> }
<MenuItem>My account</MenuItem>
const pathname = router.location ? router.location.pathname : '';
return !Routes.matchWorkflowRoute(pathname) && !Routes.matchVirtualMachineRoute(pathname) &&
!Routes.matchRepositoriesRoute(pathname) && !Routes.matchSshKeysRoute(pathname) &&
- !Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname);
+ !Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname) &&
+ !Routes.matchSiteManagerRoute(pathname);
};
export const MainContentBar = connect((state: RootState) => ({
component={TextField}
autoFocus={true}
/>
- <WarningCollection text="Renaming a file will change content adress." />
+ <WarningCollection text="Renaming a file will change content address." />
</>;
import * as React from "react";
import { compose } from 'redux';
-import { withStyles, Dialog, DialogTitle, DialogContent, DialogActions, Button, StyleRulesCallback, WithStyles, Typography, Grid } from '@material-ui/core';
+import { withStyles, Dialog, DialogTitle, DialogContent, DialogActions, Button, StyleRulesCallback, WithStyles, Grid } from '@material-ui/core';
import { WithDialogProps, withDialog } from "~/store/dialog/with-dialog";
-import { SSH_KEY_ATTRIBUTES_DIALOG } from '~/store/auth/auth-action';
+import { SSH_KEY_ATTRIBUTES_DIALOG } from '~/store/auth/auth-action-ssh';
import { ArvadosTheme } from '~/common/custom-theme';
import { SshKeyResource } from "~/models/ssh-key";
</Button>
</DialogActions>
</Dialog>
- );
\ No newline at end of file
+ );
import { compose } from 'redux';
import { withStyles, Dialog, DialogTitle, DialogContent, DialogActions, Button, StyleRulesCallback, WithStyles } from '@material-ui/core';
import { WithDialogProps, withDialog } from "~/store/dialog/with-dialog";
-import { SSH_KEY_PUBLIC_KEY_DIALOG } from '~/store/auth/auth-action';
+import { SSH_KEY_PUBLIC_KEY_DIALOG } from '~/store/auth/auth-action-ssh';
import { ArvadosTheme } from '~/common/custom-theme';
import { DefaultCodeSnippet } from '~/components/default-code-snippet/default-code-snippet';
</Button>
</DialogActions>
</Dialog>
- );
\ No newline at end of file
+ );
import { connect } from "react-redux";
import { ConfirmationDialog } from "~/components/confirmation-dialog/confirmation-dialog";
import { withDialog, WithDialogProps } from "~/store/dialog/with-dialog";
-import { SSH_KEY_REMOVE_DIALOG, removeSshKey } from '~/store/auth/auth-action';
+import { SSH_KEY_REMOVE_DIALOG, removeSshKey } from '~/store/auth/auth-action-ssh';
const mapDispatchToProps = (dispatch: Dispatch, props: WithDialogProps<any>) => ({
onConfirm: () => {
export const RemoveSshKeyDialog = compose(
withDialog(SSH_KEY_REMOVE_DIALOG),
connect(null, mapDispatchToProps)
-)(ConfirmationDialog);
\ No newline at end of file
+)(ConfirmationDialog);
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import {
+ Card,
+ CardContent,
+ Grid,
+ StyleRulesCallback,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableRow,
+ Typography,
+ WithStyles,
+ withStyles
+} from '@material-ui/core';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { Session } from "~/models/session";
+import Button from "@material-ui/core/Button";
+import { User } from "~/models/user";
+import { compose } from "redux";
+import { Field, InjectedFormProps, reduxForm, reset } from "redux-form";
+import { TextField } from "~/components/text-field/text-field";
+import { addSession } from "~/store/auth/auth-action-session";
+import { SITE_MANAGER_REMOTE_HOST_VALIDATION } from "~/validators/validators";
+
+type CssRules = 'root' | 'link' | 'buttonContainer' | 'table' | 'tableRow' | 'status' | 'remoteSiteInfo' | 'buttonAdd';
+
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ root: {
+ width: '100%',
+ overflow: 'auto'
+ },
+ link: {
+ color: theme.palette.primary.main,
+ textDecoration: 'none',
+ margin: '0px 4px'
+ },
+ buttonContainer: {
+ textAlign: 'right'
+ },
+ table: {
+ marginTop: theme.spacing.unit
+ },
+ tableRow: {
+ '& td, th': {
+ whiteSpace: 'nowrap'
+ }
+ },
+ status: {
+ width: 100,
+ padding: 5,
+ fontWeight: 'bold',
+ textAlign: 'center',
+ borderRadius: 4
+ },
+ remoteSiteInfo: {
+ marginTop: 20
+ },
+ buttonAdd: {
+ marginLeft: 10,
+ marginTop: theme.spacing.unit * 3
+ }
+});
+
+export interface SiteManagerPanelRootActionProps {
+}
+
+export interface SiteManagerPanelRootDataProps {
+ sessions: Session[];
+ user: User;
+}
+
+type SiteManagerPanelRootProps = SiteManagerPanelRootDataProps & SiteManagerPanelRootActionProps & WithStyles<CssRules> & InjectedFormProps;
+const SITE_MANAGER_FORM_NAME = 'siteManagerForm';
+
+export const SiteManagerPanelRoot = compose(
+ reduxForm<{remoteHost: string}>({
+ form: SITE_MANAGER_FORM_NAME,
+ onSubmit: (data, dispatch) => {
+ dispatch(addSession(data.remoteHost));
+ dispatch(reset(SITE_MANAGER_FORM_NAME));
+ }
+ }),
+ withStyles(styles))
+ (({ classes, sessions, handleSubmit }: SiteManagerPanelRootProps) =>
+ <Card className={classes.root}>
+ <CardContent>
+ <Grid container direction="row">
+ <Grid item xs={12}>
+ <Typography variant='body1' paragraph={true} >
+ You can log in to multiple Arvados sites here, then use the multi-site search page to search collections and projects on all sites at once.
+ </Typography>
+ </Grid>
+ </Grid>
+ <Grid item xs={12}>
+ {sessions.length > 0 && <Table className={classes.table}>
+ <TableHead>
+ <TableRow className={classes.tableRow}>
+ <TableCell>Cluster ID</TableCell>
+ <TableCell>Username</TableCell>
+ <TableCell>Email</TableCell>
+ <TableCell>Status</TableCell>
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ {sessions.map((session, index) =>
+ <TableRow key={index} className={classes.tableRow}>
+ <TableCell>{session.clusterId}</TableCell>
+ <TableCell>{session.username}</TableCell>
+ <TableCell>{session.email}</TableCell>
+ <TableCell>
+ <div className={classes.status} style={{
+ color: session.loggedIn ? '#fff' : '#000',
+ backgroundColor: session.loggedIn ? '#009966' : '#FFC414'
+ }}>
+ {session.loggedIn ? "Logged in" : "Logged out"}
+ </div>
+ </TableCell>
+ </TableRow>)}
+ </TableBody>
+ </Table>}
+ </Grid>
+ <form onSubmit={handleSubmit}>
+ <Grid container direction="row">
+ <Grid item xs={12}>
+ <Typography variant='body1' paragraph={true} className={classes.remoteSiteInfo}>
+ To add a remote Arvados site, paste the remote site's host here (see "ARVADOS_API_HOST" on the "current token" page).
+ </Typography>
+ </Grid>
+ <Grid item xs={8}>
+ <Field
+ name='remoteHost'
+ validate={SITE_MANAGER_REMOTE_HOST_VALIDATION}
+ component={TextField}
+ placeholder="zzzz.arvadosapi.com"
+ margin="normal"
+ label="New cluster"/>
+ </Grid>
+ <Grid item xs={3}>
+ <Button type="submit" variant="contained" color="primary"
+ className={classes.buttonAdd}>
+ {"ADD"}</Button>
+ </Grid>
+ </Grid>
+ </form>
+ </CardContent>
+ </Card>
+ );
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { RootState } from '~/store/store';
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import {
+ SiteManagerPanelRoot, SiteManagerPanelRootActionProps,
+ SiteManagerPanelRootDataProps
+} from "~/views/site-manager-panel/site-manager-panel-root";
+
+const mapStateToProps = (state: RootState): SiteManagerPanelRootDataProps => {
+ return {
+ sessions: state.auth.sessions,
+ user: state.auth.user!!
+ };
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): SiteManagerPanelRootActionProps => ({
+});
+
+export const SiteManagerPanel = connect(mapStateToProps, mapDispatchToProps)(SiteManagerPanelRoot);
import { RootState } from '~/store/store';
import { Dispatch } from 'redux';
import { connect } from 'react-redux';
-import { openSshKeyCreateDialog, openPublicKeyDialog } from '~/store/auth/auth-action';
+import { openSshKeyCreateDialog, openPublicKeyDialog } from '~/store/auth/auth-action-ssh';
import { openSshKeyContextMenu } from '~/store/context-menu/context-menu-actions';
import { SshKeyPanelRoot, SshKeyPanelRootDataProps, SshKeyPanelRootActionProps } from '~/views/ssh-key-panel/ssh-key-panel-root';
}
});
-export const SshKeyPanel = connect(mapStateToProps, mapDispatchToProps)(SshKeyPanelRoot);
\ No newline at end of file
+export const SshKeyPanel = connect(mapStateToProps, mapDispatchToProps)(SshKeyPanelRoot);
import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel';
import { SshKeyPanel } from '~/views/ssh-key-panel/ssh-key-panel';
+import { SiteManagerPanel } from "~/views/site-manager-panel/site-manager-panel";
import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog';
import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog';
import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog';
<Route path={Routes.VIRTUAL_MACHINES} component={VirtualMachinePanel} />
<Route path={Routes.REPOSITORIES} component={RepositoriesPanel} />
<Route path={Routes.SSH_KEYS} component={SshKeyPanel} />
+ <Route path={Routes.SITE_MANAGER} component={SiteManagerPanel} />
<Route path={Routes.KEEP_SERVICES} component={KeepServicePanel} />
<Route path={Routes.COMPUTE_NODES} component={ComputeNodePanel} />
</Switch>
<UpdateProjectDialog />
<VirtualMachineAttributesDialog />
</Grid>
- );
\ No newline at end of file
+ );