From: Daniel Kos Date: Tue, 18 Dec 2018 09:39:54 +0000 (+0100) Subject: Merge branch 'origin/master' into 14478-log-in-into-clusters X-Git-Tag: 1.4.0~71^2~16^2^2^2~3 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/f9dde5c781766b8be71d43d0f031c201a0edcfbb?hp=b6f9b49e6fed67626ae969a6864f45f002fcfd47 Merge branch 'origin/master' into 14478-log-in-into-clusters Feature #14478 # Conflicts: # src/common/config.ts # src/components/text-field/text-field.tsx # src/routes/route-change-handlers.ts # src/routes/routes.ts # src/services/auth-service/auth-service.ts # src/services/common-service/common-resource-service.ts # src/services/services.ts # src/store/auth/auth-action.ts # src/store/navigation/navigation-action.ts # src/store/workbench/workbench-actions.ts # src/validators/validators.tsx # src/views-components/main-app-bar/account-menu.tsx # src/views-components/main-content-bar/main-content-bar.tsx # src/views/workbench/workbench.tsx Arvados-DCO-1.1-Signed-off-by: Daniel Kos --- diff --git a/package.json b/package.json index 13326304..46b3ee4f 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "@material-ui/icons": "3.0.1", "@types/debounce": "3.0.0", "@types/js-yaml": "3.11.2", + "@types/jssha": "0.0.29", "@types/lodash": "4.14.116", "@types/react-copy-to-clipboard": "4.2.6", "@types/react-dnd": "3.0.2", @@ -21,6 +22,7 @@ "debounce": "1.2.0", "is-image": "2.0.0", "js-yaml": "3.12.0", + "jssha": "2.3.1", "lodash": "4.17.11", "react": "16.5.2", "react-copy-to-clipboard": "5.0.1", diff --git a/src/common/config.ts b/src/common/config.ts index db67ed8d..3961d5aa 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -35,7 +35,9 @@ export interface Config { packageVersion: string; parameters: {}; protocol: string; - remoteHosts: string; + remoteHosts: { + [key: string]: string + }; remoteHostsViaDNS: boolean; resources: {}; revision: string; @@ -102,7 +104,7 @@ export const mockConfig = (config: Partial): Config => ({ packageVersion: '', parameters: {}, protocol: '', - remoteHosts: '', + remoteHosts: {}, remoteHostsViaDNS: false, resources: {}, revision: '', @@ -133,4 +135,5 @@ const getDefaultConfig = (): ConfigJSON => ({ FILE_VIEWERS_CONFIG_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}`; diff --git a/src/components/text-field/text-field.tsx b/src/components/text-field/text-field.tsx index 627e004d..93c4080f 100644 --- a/src/components/text-field/text-field.tsx +++ b/src/components/text-field/text-field.tsx @@ -5,8 +5,15 @@ 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'; @@ -18,8 +25,8 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ type TextFieldProps = WrappedFieldProps & WithStyles; -export const TextField = withStyles(styles)((props: TextFieldProps & { - label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, disabled?: boolean, children: React.ReactNode +export const TextField = withStyles(styles)((props: TextFieldProps & { + label?: string, autoFocus?: boolean, required?: boolean, select?: boolean, disabled?: boolean, children: React.ReactNode, margin?: Margin, placeholder?: string }) => ); @@ -78,4 +87,4 @@ export const DateTextField = withStyles(styles) onChange={props.input.onChange} value={props.input.value} /> - ); \ No newline at end of file + ); diff --git a/src/index.tsx b/src/index.tsx index 7cd4ae9a..1b7a281d 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -102,7 +102,7 @@ fetchConfig() 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)); diff --git a/src/models/client-authorization.ts b/src/models/client-authorization.ts new file mode 100644 index 00000000..767916ec --- /dev/null +++ b/src/models/client-authorization.ts @@ -0,0 +1,12 @@ +export interface ClientAuthorizationResource { + uuid: string; + apiToken: string; + apiClientId: number; + userId: number; + createdByIpAddress: string; + lastUsedByIpAddress: string; + lastUsedAt: string; + expiresAt: string; + ownerUuid: string; + scopes: string[]; +} diff --git a/src/models/session.ts b/src/models/session.ts new file mode 100644 index 00000000..9a942967 --- /dev/null +++ b/src/models/session.ts @@ -0,0 +1,21 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +export enum SessionStatus { + INVALIDATED, + BEING_VALIDATED, + VALIDATED +} + +export interface Session { + clusterId: string; + remoteHost: string; + baseUrl: string; + username: string; + email: string; + token: string; + loggedIn: boolean; + status: SessionStatus; + active: boolean; +} diff --git a/src/routes/route-change-handlers.ts b/src/routes/route-change-handlers.ts index 03e2a38a..bb88f4a1 100644 --- a/src/routes/route-change-handlers.ts +++ b/src/routes/route-change-handlers.ts @@ -34,6 +34,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => { const workflowMatch = Routes.matchWorkflowRoute(pathname); const sshKeysUserMatch = Routes.matchSshKeysUserRoute(pathname); const sshKeysAdminMatch = Routes.matchSshKeysAdminRoute(pathname); + const siteManagerMatch = Routes.matchSiteManagerRoute(pathname); const keepServicesMatch = Routes.matchKeepServicesRoute(pathname); const computeNodesMatch = Routes.matchComputeNodesRoute(pathname); const apiClientAuthorizationsMatch = Routes.matchApiClientAuthorizationsRoute(pathname); @@ -79,6 +80,8 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => { store.dispatch(WorkbenchActions.loadSshKeys); } else if (sshKeysAdminMatch) { store.dispatch(WorkbenchActions.loadSshKeys); + } else if (siteManagerMatch) { + store.dispatch(WorkbenchActions.loadSiteManager); } else if (keepServicesMatch) { store.dispatch(WorkbenchActions.loadKeepServices); } else if (computeNodesMatch) { diff --git a/src/routes/routes.ts b/src/routes/routes.ts index 661a065e..b1da9496 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -25,6 +25,7 @@ export const Routes = { SEARCH_RESULTS: '/search-results', SSH_KEYS_ADMIN: `/ssh-keys-admin`, SSH_KEYS_USER: `/ssh-keys-user`, + SITE_MANAGER: `/site-manager`, MY_ACCOUNT: '/my-account', KEEP_SERVICES: `/keep-services`, COMPUTE_NODES: `/nodes`, @@ -107,6 +108,9 @@ export const matchSshKeysUserRoute = (route: string) => export const matchSshKeysAdminRoute = (route: string) => matchPath(route, { path: Routes.SSH_KEYS_ADMIN }); +export const matchSiteManagerRoute = (route: string) => + matchPath(route, { path: Routes.SITE_MANAGER }); + export const matchMyAccountRoute = (route: string) => matchPath(route, { path: Routes.MY_ACCOUNT }); diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts index 22c9dcd6..8601e208 100644 --- a/src/services/auth-service/auth-service.ts +++ b/src/services/auth-service/auth-service.ts @@ -2,10 +2,13 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { User, UserPrefs } from "~/models/user"; +import { getUserFullname, User, UserPrefs } from "~/models/user"; import { AxiosInstance } from "axios"; import { ApiActions } from "~/services/api/api-actions"; import * as uuid from "uuid/v4"; +import { Session, SessionStatus } from "~/models/session"; +import { Config } from "~/common/config"; +import { uniqBy } from "lodash"; export const API_TOKEN_KEY = 'apiToken'; export const USER_EMAIL_KEY = 'userEmail'; @@ -137,4 +140,53 @@ export class AuthService { 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.rootUrl, + baseUrl: cfg.baseUrl, + username: getUserFullname(user), + email: user ? user.email : '', + token: this.getApiToken(), + loggedIn: true, + active: true, + status: SessionStatus.VALIDATED + } as Session; + const localSessions = this.getSessions(); + const cfgSessions = Object.keys(cfg.remoteHosts).map(clusterId => { + const remoteHost = cfg.remoteHosts[clusterId]; + return { + clusterId, + remoteHost, + baseUrl: '', + username: '', + email: '', + token: '', + loggedIn: false, + active: false, + status: SessionStatus.INVALIDATED + } as Session; + }); + const sessions = [currentSession] + .concat(localSessions) + .concat(cfgSessions); + + const uniqSessions = uniqBy(sessions, 'clusterId'); + + return uniqSessions; + } } diff --git a/src/store/auth/auth-action-session.ts b/src/store/auth/auth-action-session.ts new file mode 100644 index 00000000..83e98e96 --- /dev/null +++ b/src/store/auth/auth-action-session.ts @@ -0,0 +1,208 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +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, User } from "~/models/user"; +import { authActions } from "~/store/auth/auth-action"; +import { Config, DISCOVERY_URL } from "~/common/config"; +import { Session, SessionStatus } from "~/models/session"; +import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; +import { UserDetailsResponse } from "~/services/auth-service/auth-service"; +import * as jsSHA from "jssha"; + +const getRemoteHostBaseUrl = async (remoteHost: string): Promise => { + let url = remoteHost; + if (url.indexOf('://') < 0) { + url = 'https://' + url; + } + const origin = new URL(url).origin; + let baseUrl: string | null = null; + + try { + const resp = await Axios.get(`${origin}/${DISCOVERY_URL}`); + baseUrl = resp.data.baseUrl; + } catch (err) { + try { + const resp = await Axios.get(`${origin}/status.json`); + baseUrl = resp.data.apiBaseURL; + } catch (err) { + } + } + + if (baseUrl && baseUrl[baseUrl.length - 1] === '/') { + baseUrl = baseUrl.substr(0, baseUrl.length - 1); + } + + return baseUrl; +}; + +const getUserDetails = async (baseUrl: string, token: string): Promise => { + const resp = await Axios.get(`${baseUrl}/users/current`, { + headers: { + Authorization: `OAuth2 ${token}` + } + }); + return resp.data; +}; + +const getTokenUuid = async (baseUrl: string, token: string): Promise => { + if (token.startsWith("v2/")) { + const uuid = token.split("/")[1]; + return Promise.resolve(uuid); + } + + const resp = await Axios.get(`${baseUrl}/api_client_authorizations`, { + headers: { + Authorization: `OAuth2 ${token}` + }, + data: { + filters: JSON.stringify([['api_token', '=', token]]) + } + }); + + return resp.data.items[0].uuid; +}; + +const getSaltedToken = (clusterId: string, tokenUuid: string, token: string) => { + const shaObj = new jsSHA("SHA-1", "TEXT"); + let secret = token; + if (token.startsWith("v2/")) { + secret = token.split("/")[2]; + } + shaObj.setHMACKey(secret, "TEXT"); + shaObj.update(clusterId); + const hmac = shaObj.getHMAC("HEX"); + return `v2/${tokenUuid}/${hmac}`; +}; + +const clusterLogin = async (clusterId: string, baseUrl: string, activeSession: Session): Promise<{user: User, token: string}> => { + const tokenUuid = await getTokenUuid(activeSession.baseUrl, activeSession.token); + const saltedToken = getSaltedToken(clusterId, tokenUuid, activeSession.token); + const user = await getUserDetails(baseUrl, saltedToken); + return { + user: { + firstName: user.first_name, + lastName: user.last_name, + uuid: user.uuid, + ownerUuid: user.owner_uuid, + email: user.email, + isAdmin: user.is_admin, + identityUrl: user.identity_url, + prefs: user.prefs + }, + token: saltedToken + }; +}; + +const getActiveSession = (sessions: Session[]): Session | undefined => sessions.find(s => s.active); + +export const validateCluster = async (remoteHost: string, clusterId: string, activeSession: Session): Promise<{ user: User; token: string, baseUrl: string }> => { + const baseUrl = await getRemoteHostBaseUrl(remoteHost); + if (!baseUrl) { + return Promise.reject(`Could not find base url for ${remoteHost}`); + } + const { user, token } = await clusterLogin(clusterId, baseUrl, activeSession); + return { baseUrl, user, token }; +}; + +export const validateSession = (session: Session, activeSession: Session) => + async (dispatch: Dispatch): Promise => { + dispatch(authActions.UPDATE_SESSION({ ...session, status: SessionStatus.BEING_VALIDATED })); + session.loggedIn = false; + try { + const { baseUrl, user, token } = await validateCluster(session.remoteHost, session.clusterId, activeSession); + session.baseUrl = baseUrl; + session.token = token; + session.email = user.email; + session.username = getUserFullname(user); + session.loggedIn = true; + } catch { + session.loggedIn = false; + } finally { + session.status = SessionStatus.VALIDATED; + dispatch(authActions.UPDATE_SESSION(session)); + } + return session; + }; + +export const validateSessions = () => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const sessions = getState().auth.sessions; + const activeSession = getActiveSession(sessions); + if (activeSession) { + dispatch(progressIndicatorActions.START_WORKING("sessionsValidation")); + for (const session of sessions) { + if (session.status === SessionStatus.INVALIDATED) { + await dispatch(validateSession(session, activeSession)); + } + } + services.authService.saveSessions(sessions); + dispatch(progressIndicatorActions.STOP_WORKING("sessionsValidation")); + } + }; + +export const addSession = (remoteHost: string) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const sessions = getState().auth.sessions; + const activeSession = getActiveSession(sessions); + if (activeSession) { + const clusterId = remoteHost.match(/^(\w+)\./)![1]; + if (sessions.find(s => s.clusterId === clusterId)) { + return Promise.reject("Cluster already exists"); + } + try { + const { baseUrl, user, token } = await validateCluster(remoteHost, clusterId, activeSession); + const session = { + loggedIn: true, + status: SessionStatus.VALIDATED, + active: false, + email: user.email, + username: getUserFullname(user), + remoteHost, + baseUrl, + clusterId, + token + }; + + dispatch(authActions.ADD_SESSION(session)); + services.authService.saveSessions(getState().auth.sessions); + + return session; + } catch (e) { + } + } + return Promise.reject("Could not validate cluster"); + }; + +export const toggleSession = (session: Session) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + let s = { ...session }; + + if (session.loggedIn) { + s.loggedIn = false; + } else { + const sessions = getState().auth.sessions; + const activeSession = getActiveSession(sessions); + if (activeSession) { + s = await dispatch(validateSession(s, activeSession)) as Session; + } + } + + dispatch(authActions.UPDATE_SESSION(s)); + services.authService.saveSessions(getState().auth.sessions); + }; + +export const loadSiteManagerPanel = () => + async (dispatch: Dispatch) => { + try { + dispatch(setBreadcrumbs([{ label: 'Site Manager'}])); + dispatch(validateSessions()); + } catch (e) { + return; + } + }; diff --git a/src/store/auth/auth-action-ssh.ts b/src/store/auth/auth-action-ssh.ts new file mode 100644 index 00000000..2c3a2722 --- /dev/null +++ b/src/store/auth/auth-action-ssh.ts @@ -0,0 +1,102 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +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, 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; + } + }; + diff --git a/src/store/auth/auth-actions.test.ts b/src/store/auth/auth-action.test.ts similarity index 93% rename from src/store/auth/auth-actions.test.ts rename to src/store/auth/auth-action.test.ts index ed223795..d58c9159 100644 --- a/src/store/auth/auth-actions.test.ts +++ b/src/store/auth/auth-action.test.ts @@ -18,7 +18,7 @@ import 'jest-localstorage-mock'; 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', () => { @@ -47,7 +47,11 @@ 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", diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index d72a3ece..ed998ab5 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -4,17 +4,13 @@ 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 * as Routes from '~/routes/routes'; +import { Session } from "~/models/session"; +import { Config } from '~/common/config'; export const authActions = unionize({ SAVE_API_TOKEN: ofType(), @@ -25,19 +21,13 @@ export const authActions = unionize({ USER_DETAILS_SUCCESS: ofType(), SET_SSH_KEYS: ofType(), ADD_SSH_KEY: ofType(), - REMOVE_SSH_KEY: ofType() + REMOVE_SSH_KEY: ofType(), + SET_SESSIONS: ofType(), + ADD_SESSION: ofType(), + REMOVE_SESSION: ofType(), + UPDATE_SESSION: ofType() }); -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}` @@ -51,7 +41,7 @@ function removeAuthorizationHeader(client: AxiosInstance) { 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) { @@ -60,6 +50,9 @@ export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, se 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) => { @@ -90,80 +83,4 @@ export const getUserDetails = () => (dispatch: Dispatch, getState: () => RootSta }); }; -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, getState: () => RootState, services: ServiceRepository) => { - try { - const userUuid = getState().auth.user!.uuid; - const { router } = getState(); - const pathname = router.location ? router.location.pathname : ''; - dispatch(setBreadcrumbs([{ label: 'SSH Keys' }])); - const response = await services.authorizedKeysService.list(); - const userSshKeys = response.items.find(it => it.ownerUuid === userUuid); - return Routes.matchSshKeysAdminRoute(pathname) ? dispatch(authActions.SET_SSH_KEYS(response.items)) : dispatch(authActions.SET_SSH_KEYS([userSshKeys!])); - } catch (e) { - return; - } - }; - export type AuthAction = UnionOf; diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts index a8e4340a..a2822f10 100644 --- a/src/store/auth/auth-reducer.ts +++ b/src/store/auth/auth-reducer.ts @@ -6,17 +6,20 @@ 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: [] + sshKeys: [], + sessions: [] }; export const authReducer = (services: ServiceRepository) => (state = initialState, action: AuthAction) => { @@ -45,6 +48,26 @@ export const authReducer = (services: ServiceRepository) => (state = initialStat 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 }); }; diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts index c53c55e8..f610eb5e 100644 --- a/src/store/navigation/navigation-action.ts +++ b/src/store/navigation/navigation-action.ts @@ -77,6 +77,8 @@ export const navigateToSshKeysAdmin= push(Routes.SSH_KEYS_ADMIN); export const navigateToSshKeysUser= push(Routes.SSH_KEYS_USER); +export const navigateToSiteManager= push(Routes.SITE_MANAGER); + export const navigateToMyAccount = push(Routes.MY_ACCOUNT); export const navigateToKeepServices = push(Routes.KEEP_SERVICES); diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index 5e9dc285..46ab1f59 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -39,8 +39,9 @@ import { sharedWithMePanelActions } from '~/store/shared-with-me-panel/shared-wi 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 { loadMyAccountPanel } from '~/store/my-account/my-account-panel-actions'; +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'; @@ -435,6 +436,11 @@ export const loadSshKeys = handleFirstTimeLoad( await dispatch(loadSshKeysPanel()); }); +export const loadSiteManager = handleFirstTimeLoad( +async (dispatch: Dispatch) => { + await dispatch(loadSiteManagerPanel()); +}); + export const loadMyAccount = handleFirstTimeLoad( (dispatch: Dispatch) => { dispatch(loadMyAccountPanel()); diff --git a/src/validators/is-remote-host.tsx b/src/validators/is-remote-host.tsx new file mode 100644 index 00000000..b5e22312 --- /dev/null +++ b/src/validators/is-remote-host.tsx @@ -0,0 +1,10 @@ +// 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; +}; diff --git a/src/validators/validators.tsx b/src/validators/validators.tsx index 9bc76419..acef9744 100644 --- a/src/validators/validators.tsx +++ b/src/validators/validators.tsx @@ -5,6 +5,7 @@ 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)]; @@ -31,4 +32,6 @@ export const USER_LENGTH_VALIDATION = [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)]; + export const MY_ACCOUNT_VALIDATION = [require]; diff --git a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts index 0ce0c431..c2885185 100644 --- a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts +++ b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts @@ -4,7 +4,7 @@ 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 = [[{ diff --git a/src/views-components/dialog-create/dialog-ssh-key-create.tsx b/src/views-components/dialog-create/dialog-ssh-key-create.tsx index b7c9b1fb..aed1cd24 100644 --- a/src/views-components/dialog-create/dialog-ssh-key-create.tsx +++ b/src/views-components/dialog-create/dialog-ssh-key-create.tsx @@ -7,7 +7,7 @@ import { InjectedFormProps } from 'redux-form'; 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; diff --git a/src/views-components/dialog-forms/create-ssh-key-dialog.ts b/src/views-components/dialog-forms/create-ssh-key-dialog.ts index e9652433..6472c3ae 100644 --- a/src/views-components/dialog-forms/create-ssh-key-dialog.ts +++ b/src/views-components/dialog-forms/create-ssh-key-dialog.ts @@ -5,7 +5,11 @@ 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( @@ -16,4 +20,4 @@ export const CreateSshKeyDialog = compose( dispatch(createSshKey(data)); } }) -)(DialogSshKeyCreate); \ No newline at end of file +)(DialogSshKeyCreate); diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx index 53a5753d..6c1e46c5 100644 --- a/src/views-components/main-app-bar/account-menu.tsx +++ b/src/views-components/main-app-bar/account-menu.tsx @@ -11,9 +11,13 @@ import { DispatchProp, connect } from 'react-redux'; import { logout } from '~/store/auth/auth-action'; import { RootState } from "~/store/store"; import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions'; -import { navigateToSshKeysUser, navigateToMyAccount } from '~/store/navigation/navigation-action'; +import { openRepositoriesPanel } from "~/store/repositories/repositories-actions"; +import { + navigateToSiteManager, + navigateToSshKeysUser, + navigateToMyAccount +} from '~/store/navigation/navigation-action'; import { openUserVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions"; -import { openRepositoriesPanel } from '~/store/repositories/repositories-actions'; interface AccountMenuProps { user?: User; @@ -40,6 +44,7 @@ export const AccountMenu = connect(mapStateToProps)( {!user.isAdmin && dispatch(openRepositoriesPanel())}>Repositories} dispatch(openCurrentTokenDialog)}>Current token dispatch(navigateToSshKeysUser)}>Ssh Keys + dispatch(navigateToSiteManager)}>Site Manager dispatch(navigateToMyAccount)}>My account dispatch(logout())}>Logout diff --git a/src/views-components/main-content-bar/main-content-bar.tsx b/src/views-components/main-content-bar/main-content-bar.tsx index 3806b524..c0014d00 100644 --- a/src/views-components/main-content-bar/main-content-bar.tsx +++ b/src/views-components/main-content-bar/main-content-bar.tsx @@ -21,6 +21,7 @@ const isButtonVisible = ({ router }: RootState) => { return !Routes.matchWorkflowRoute(pathname) && !Routes.matchUserVirtualMachineRoute(pathname) && !Routes.matchAdminVirtualMachineRoute(pathname) && !Routes.matchRepositoriesRoute(pathname) && !Routes.matchSshKeysAdminRoute(pathname) && !Routes.matchSshKeysUserRoute(pathname) && + !Routes.matchSiteManagerRoute(pathname) && !Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname) && !Routes.matchApiClientAuthorizationsRoute(pathname) && !Routes.matchUsersRoute(pathname) && !Routes.matchMyAccountRoute(pathname) && !Routes.matchLinksRoute(pathname); diff --git a/src/views-components/rename-file-dialog/rename-file-dialog.tsx b/src/views-components/rename-file-dialog/rename-file-dialog.tsx index 9e276ade..1a806511 100644 --- a/src/views-components/rename-file-dialog/rename-file-dialog.tsx +++ b/src/views-components/rename-file-dialog/rename-file-dialog.tsx @@ -37,5 +37,5 @@ const RenameDialogFormFields = (props: WithDialogProps) => component={TextField} autoFocus={true} /> - + ; diff --git a/src/views-components/ssh-keys-dialog/attributes-dialog.tsx b/src/views-components/ssh-keys-dialog/attributes-dialog.tsx index ce896dcc..0c164dbd 100644 --- a/src/views-components/ssh-keys-dialog/attributes-dialog.tsx +++ b/src/views-components/ssh-keys-dialog/attributes-dialog.tsx @@ -4,9 +4,9 @@ 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"; @@ -66,4 +66,4 @@ export const AttributesSshKeyDialog = compose( - ); \ No newline at end of file + ); diff --git a/src/views-components/ssh-keys-dialog/public-key-dialog.tsx b/src/views-components/ssh-keys-dialog/public-key-dialog.tsx index 77c6cfde..11ec1595 100644 --- a/src/views-components/ssh-keys-dialog/public-key-dialog.tsx +++ b/src/views-components/ssh-keys-dialog/public-key-dialog.tsx @@ -6,7 +6,7 @@ import * as React from "react"; 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'; @@ -52,4 +52,4 @@ export const PublicKeyDialog = compose( - ); \ No newline at end of file + ); diff --git a/src/views-components/ssh-keys-dialog/remove-dialog.tsx b/src/views-components/ssh-keys-dialog/remove-dialog.tsx index 8077f21b..916e918c 100644 --- a/src/views-components/ssh-keys-dialog/remove-dialog.tsx +++ b/src/views-components/ssh-keys-dialog/remove-dialog.tsx @@ -5,7 +5,7 @@ import { Dispatch, compose } from 'redux'; 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) => ({ onConfirm: () => { @@ -17,4 +17,4 @@ const mapDispatchToProps = (dispatch: Dispatch, props: WithDialogProps) => export const RemoveSshKeyDialog = compose( withDialog(SSH_KEY_REMOVE_DIALOG), connect(null, mapDispatchToProps) -)(ConfirmationDialog); \ No newline at end of file +)(ConfirmationDialog); diff --git a/src/views/site-manager-panel/site-manager-panel-root.tsx b/src/views/site-manager-panel/site-manager-panel-root.tsx new file mode 100644 index 00000000..3b8053e7 --- /dev/null +++ b/src/views/site-manager-panel/site-manager-panel-root.tsx @@ -0,0 +1,180 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import * as React from 'react'; +import { + Card, + CardContent, + CircularProgress, + Grid, + StyleRulesCallback, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + Typography, + WithStyles, + withStyles +} from '@material-ui/core'; +import { ArvadosTheme } from '~/common/custom-theme'; +import { Session, SessionStatus } from "~/models/session"; +import Button from "@material-ui/core/Button"; +import { User } from "~/models/user"; +import { compose } from "redux"; +import { Field, FormErrors, InjectedFormProps, reduxForm, reset, stopSubmit } 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' | + 'remoteSiteInfo' | 'buttonAdd' | 'buttonLoggedIn' | 'buttonLoggedOut' | + 'statusCell'; + +const styles: StyleRulesCallback = (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' + } + }, + statusCell: { + minWidth: 160 + }, + remoteSiteInfo: { + marginTop: 20 + }, + buttonAdd: { + marginLeft: 10, + marginTop: theme.spacing.unit * 3 + }, + buttonLoggedIn: { + minHeight: theme.spacing.unit, + padding: 5, + color: '#fff', + backgroundColor: '#009966', + '&:hover': { + backgroundColor: '#008450', + } + }, + buttonLoggedOut: { + minHeight: theme.spacing.unit, + padding: 5, + color: '#000', + backgroundColor: '#FFC414', + '&:hover': { + backgroundColor: '#eaaf14', + } + } +}); + +export interface SiteManagerPanelRootActionProps { + toggleSession: (session: Session) => void; +} + +export interface SiteManagerPanelRootDataProps { + sessions: Session[]; + user: User; +} + +type SiteManagerPanelRootProps = SiteManagerPanelRootDataProps & SiteManagerPanelRootActionProps & WithStyles & InjectedFormProps; +const SITE_MANAGER_FORM_NAME = 'siteManagerForm'; + +export const SiteManagerPanelRoot = compose( + reduxForm<{remoteHost: string}>({ + form: SITE_MANAGER_FORM_NAME, + touchOnBlur: false, + onSubmit: (data, dispatch) => { + dispatch(addSession(data.remoteHost)).then(() => { + dispatch(reset(SITE_MANAGER_FORM_NAME)); + }).catch((e: any) => { + const errors = { + remoteHost: e + } as FormErrors; + dispatch(stopSubmit(SITE_MANAGER_FORM_NAME, errors)); + }); + } + }), + withStyles(styles)) + (({ classes, sessions, handleSubmit, toggleSession }: SiteManagerPanelRootProps) => + + + + + + 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. + + + + + {sessions.length > 0 && + + + Cluster ID + Username + Email + Status + + + + {sessions.map((session, index) => { + const validating = session.status === SessionStatus.BEING_VALIDATED; + return + {session.clusterId} + {validating ? : session.username} + {validating ? : session.email} + + + + ; + })} + +
} + +
+ + + + To add a remote Arvados site, paste the remote site's host here (see "ARVADOS_API_HOST" on the "current token" page). + + + + + + + + + +
+ + + ); diff --git a/src/views/site-manager-panel/site-manager-panel.tsx b/src/views/site-manager-panel/site-manager-panel.tsx new file mode 100644 index 00000000..8b762108 --- /dev/null +++ b/src/views/site-manager-panel/site-manager-panel.tsx @@ -0,0 +1,28 @@ +// 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"; +import { Session } from "~/models/session"; +import { toggleSession } from "~/store/auth/auth-action-session"; + +const mapStateToProps = (state: RootState): SiteManagerPanelRootDataProps => { + return { + sessions: state.auth.sessions, + user: state.auth.user!! + }; +}; + +const mapDispatchToProps = (dispatch: Dispatch): SiteManagerPanelRootActionProps => ({ + toggleSession: (session: Session) => { + dispatch(toggleSession(session)); + } +}); + +export const SiteManagerPanel = connect(mapStateToProps, mapDispatchToProps)(SiteManagerPanelRoot); diff --git a/src/views/ssh-key-panel/ssh-key-panel.tsx b/src/views/ssh-key-panel/ssh-key-panel.tsx index 4e800296..6575a9cc 100644 --- a/src/views/ssh-key-panel/ssh-key-panel.tsx +++ b/src/views/ssh-key-panel/ssh-key-panel.tsx @@ -5,7 +5,7 @@ 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'; @@ -28,4 +28,4 @@ const mapDispatchToProps = (dispatch: Dispatch): SshKeyPanelRootActionProps => ( } }); -export const SshKeyPanel = connect(mapStateToProps, mapDispatchToProps)(SshKeyPanelRoot); \ No newline at end of file +export const SshKeyPanel = connect(mapStateToProps, mapDispatchToProps)(SshKeyPanelRoot); diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index bff328e8..90b2dad0 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -45,6 +45,7 @@ import SplitterLayout from 'react-splitter-layout'; 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 { MyAccountPanel } from '~/views/my-account-panel/my-account-panel'; import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog'; import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog'; @@ -161,6 +162,7 @@ export const WorkbenchPanel = + @@ -231,4 +233,4 @@ export const WorkbenchPanel = - ); \ No newline at end of file + ); diff --git a/yarn.lock b/yarn.lock index d3d6396d..b642d71a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -130,6 +130,11 @@ csstype "^2.0.0" indefinite-observable "^1.0.1" +"@types/jssha@0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/jssha/-/jssha-0.0.29.tgz#95e83dba98787ff796d2d5f37a1925abf41bc9cb" + integrity sha1-leg9uph4f/eW0tXzehklq/Qbycs= + "@types/lodash@4.14.116": version "4.14.116" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9" @@ -5540,6 +5545,11 @@ jss@^9.3.3: symbol-observable "^1.1.0" warning "^3.0.0" +jssha@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/jssha/-/jssha-2.3.1.tgz#147b2125369035ca4b2f7d210dc539f009b3de9a" + integrity sha1-FHshJTaQNcpLL30hDcU58Amz3po= + keycode@^2.1.9: version "2.2.0" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"