X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7d40a4a432ce8dfea8e49f3d330220aea6957790..44821dc84765936ce99fa2d760ef683281f0a578:/src/store/auth/auth-action-session.ts diff --git a/src/store/auth/auth-action-session.ts b/src/store/auth/auth-action-session.ts index d588ce1f..7e81f2d9 100644 --- a/src/store/auth/auth-action-session.ts +++ b/src/store/auth/auth-action-session.ts @@ -3,22 +3,22 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from "redux"; -import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions"; -import { RootState } from "~/store/store"; -import { ServiceRepository, createServices, setAuthorizationHeader } from "~/services/services"; +import { setBreadcrumbs } from "store/breadcrumbs/breadcrumbs-actions"; +import { RootState } from "store/store"; +import { ServiceRepository, createServices, setAuthorizationHeader } from "services/services"; import Axios, { AxiosInstance } from "axios"; -import { User, getUserDisplayName } from "~/models/user"; -import { authActions } from "~/store/auth/auth-action"; +import { User, getUserDisplayName } from "models/user"; +import { authActions } from "store/auth/auth-action"; import { Config, ClusterConfigJSON, CLUSTER_CONFIG_PATH, DISCOVERY_DOC_PATH, buildConfig, mockClusterConfigJSON -} from "~/common/config"; -import { normalizeURLPath } from "~/common/url"; -import { Session, SessionStatus } from "~/models/session"; -import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; -import { AuthService } from "~/services/auth-service/auth-service"; -import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; -import * as jsSHA from "jssha"; +} from "common/config"; +import { normalizeURLPath } from "common/url"; +import { Session, SessionStatus } from "models/session"; +import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions"; +import { AuthService } from "services/auth-service/auth-service"; +import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions"; +import jsSHA from "jssha"; const getClusterConfig = async (origin: string, apiClient: AxiosInstance): Promise => { let configFromDD: Config | undefined; @@ -99,7 +99,7 @@ export const getSaltedToken = (clusterId: string, token: string) => { throw new Error(invalidV2Token); } let salted = secret; - if (uuid.substr(0, 5) !== clusterId) { + if (uuid.substring(0, 5) !== clusterId) { shaObj.setHMACKey(secret, "TEXT"); shaObj.update(clusterId); salted = shaObj.getHMAC("HEX");