From 85889bc6391d94c82d6ef90ddada3671a2106387 Mon Sep 17 00:00:00 2001 From: Fran McDade Date: Wed, 3 Apr 2024 16:22:09 +1000 Subject: [PATCH] fix: hca ma pilot prod is pointing to terra dev resources instead of terra prod (#3958) (#3959) Co-authored-by: Fran McDade --- .../site-config/hca-dcp/cc-ma-dev/config.ts | 8 +++-- explorer/site-config/hca-dcp/dev/config.ts | 7 ++-- .../ma-prod/authentication/authentication.tsx | 36 +++++++------------ .../site-config/hca-dcp/ma-prod/config.ts | 6 +++- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/explorer/site-config/hca-dcp/cc-ma-dev/config.ts b/explorer/site-config/hca-dcp/cc-ma-dev/config.ts index 904cc1191..f341dfa50 100644 --- a/explorer/site-config/hca-dcp/cc-ma-dev/config.ts +++ b/explorer/site-config/hca-dcp/cc-ma-dev/config.ts @@ -1,4 +1,4 @@ -import { SiteConfig } from "@clevercanary/data-explorer-ui/lib/config/entities"; +import { SiteConfig } from "../../common/entities"; import { makeConfig } from "../dev/config"; import { getAuthenticationConfig } from "./authentication/authentication"; import { getMAExportConfig } from "./export/export"; @@ -15,7 +15,6 @@ const config: SiteConfig = { ...makeManagedAccessConfig( makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL, CATALOG) ), - authentication: getAuthenticationConfig(PORTAL_URL), }; /** @@ -27,6 +26,11 @@ export function makeManagedAccessConfig(config: SiteConfig): SiteConfig { // Clone config. const cloneConfig = { ...config }; + // Add authentication to the config. + if (cloneConfig.portalURL) { + cloneConfig.authentication = getAuthenticationConfig(cloneConfig.portalURL); + } + // Adding authentication to the header. const header = { ...cloneConfig.layout.header }; cloneConfig.layout.header = { ...header, authenticationEnabled: true }; diff --git a/explorer/site-config/hca-dcp/dev/config.ts b/explorer/site-config/hca-dcp/dev/config.ts index 401e935ef..2a1316511 100644 --- a/explorer/site-config/hca-dcp/dev/config.ts +++ b/explorer/site-config/hca-dcp/dev/config.ts @@ -1,10 +1,7 @@ import { APIEndpoints } from "@clevercanary/data-explorer-ui/lib/apis/azul/common/entities"; import { ELEMENT_ALIGNMENT } from "@clevercanary/data-explorer-ui/lib/common/entities"; import { ANCHOR_TARGET } from "@clevercanary/data-explorer-ui/lib/components/Links/common/entities"; -import { - SiteConfig, - SystemStatusBindResponseFn, -} from "@clevercanary/data-explorer-ui/lib/config/entities"; +import { SystemStatusBindResponseFn } from "@clevercanary/data-explorer-ui/lib/config/entities"; import { tabletUp } from "@clevercanary/data-explorer-ui/lib/theme/common/breakpoints"; import { TEXT_BODY_LARGE_500, @@ -15,6 +12,7 @@ import { } from "@clevercanary/data-explorer-ui/lib/theme/common/typography"; import * as C from "../../../app/components/index"; import { bindSystemStatusResponse } from "../../../app/viewModelBuilders/azul/hca-dcp/common/systemStatusMapper/systemStatusMapper"; +import { SiteConfig } from "../../common/entities"; import { HCA_DCP_CATEGORY_KEY, HCA_DCP_CATEGORY_LABEL } from "../category"; import { announcements } from "./announcements/announcements"; import { exportConfig } from "./export/export"; @@ -225,6 +223,7 @@ export function makeConfig( searchURL: `${portalUrl}/search`, }, }, + portalURL: portalUrl, redirectRootToPath: HOME_PAGE_PATH, summaryConfig: { apiPath: "index/summary", diff --git a/explorer/site-config/hca-dcp/ma-prod/authentication/authentication.tsx b/explorer/site-config/hca-dcp/ma-prod/authentication/authentication.tsx index 72856a57e..b3b0dabde 100644 --- a/explorer/site-config/hca-dcp/ma-prod/authentication/authentication.tsx +++ b/explorer/site-config/hca-dcp/ma-prod/authentication/authentication.tsx @@ -1,28 +1,18 @@ import { AuthenticationConfig } from "@clevercanary/data-explorer-ui/lib/config/entities"; -import { - LoginTermsOfService, - LoginText, -} from "../../../../app/components/common/MDXContent/hca-dcp"; export function getAuthenticationConfig( - portalURL: string + authenticationConfig: AuthenticationConfig ): AuthenticationConfig { - return { - googleGISAuthConfig: { - clientId: - "473200283737-4pt6e9lraf5jbb650f9kp7ethelv4a8l.apps.googleusercontent.com", - googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo", - scope: - "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid", - }, - termsOfService: , - terraAuthConfig: { - termsOfServiceEndpoint: - "https://sam.dsde-dev.broadinstitute.org/register/user/v2/self/termsOfServiceDetails", - terraProfileEndpoint: - "https://sam.dsde-dev.broadinstitute.org/register/user/v1", - }, - text: , - title: "Sign in to your account", - }; + const authentication = { ...authenticationConfig }; + if (authentication.googleGISAuthConfig) { + authentication.googleGISAuthConfig.clientId = + "473200283737-4pt6e9lraf5jbb650f9kp7ethelv4a8l.apps.googleusercontent.com"; + } + if (authentication.terraAuthConfig) { + authentication.terraAuthConfig.termsOfServiceEndpoint = + "https://sam.dsde-prod.broadinstitute.org/register/user/v2/self/termsOfServiceDetails"; + authentication.terraAuthConfig.terraProfileEndpoint = + "https://sam.dsde-prod.broadinstitute.org/register/user/v1"; + } + return authentication; } diff --git a/explorer/site-config/hca-dcp/ma-prod/config.ts b/explorer/site-config/hca-dcp/ma-prod/config.ts index 9715c8b12..9f97b0031 100644 --- a/explorer/site-config/hca-dcp/ma-prod/config.ts +++ b/explorer/site-config/hca-dcp/ma-prod/config.ts @@ -10,7 +10,6 @@ const PORTAL_URL = "https://data.humancellatlas.org"; const config: SiteConfig = { ...makeManagedAccessConfig(makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL)), - authentication: getAuthenticationConfig(PORTAL_URL), }; // Update gtmAuth for the prod environment lookup. @@ -21,4 +20,9 @@ if (config.analytics) { config.analytics = analytics; } +// Update authentication for the prod environment. +if (config.authentication) { + config.authentication = getAuthenticationConfig(config.authentication); +} + export default config;