feat: implement bottom half of Terra account nag indicating the NIH a…

…ccount (#3658) (#3664) * feat: implement bottom half of Terra account nag indicating the NIH account (#3658) * chore: updated clevercanary/data-explorer-ui to v0.45.0 (#3658) --------- Co-authored-by: Fran McDade <[email protected]>
DataBiosphere · Sep 18, 2023 · 8dd7ef4 · 8dd7ef4
1 parent 24b6f2a
commit 8dd7ef4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/explorer/package-lock.json b/explorer/package-lock.json
diff --git a/explorer/package.json b/explorer/package.json
@@ -33,7 +33,7 @@
     "test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts"
   },
   "dependencies": {
-    "@clevercanary/data-explorer-ui": "0.44.0",
+    "@clevercanary/data-explorer-ui": "0.45.0",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
     "@mdx-js/loader": "^2.3.0",

diff --git a/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts b/explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
     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: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
+  terraAuthConfig: {
+    terraNIHProfileEndpoint:
+      "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
     terraProfileEndpoint:
       "https://sam.dsde-dev.broadinstitute.org/register/user/v1",
   },
-  termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
   text: MDX.RenderComponent({ Component: MDX.LoginText }),
   title: "Sign in to your account",
   warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

diff --git a/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts b/explorer/site-config/anvil-cmg/dev/authentication/authentication.ts
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
     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: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
+  terraAuthConfig: {
+    terraNIHProfileEndpoint:
+      "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
     terraProfileEndpoint:
       "https://sam.dsde-prod.broadinstitute.org/register/user/v1",
   },
-  termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
   text: MDX.RenderComponent({ Component: MDX.LoginText }),
   title: "Sign in to your account",
   warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

diff --git a/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts b/explorer/site-config/anvil-cmg/prod/authentication/authentication.ts
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
     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: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
+  terraAuthConfig: {
+    terraNIHProfileEndpoint:
+      "https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
     terraProfileEndpoint:
       "https://sam.dsde-dev.broadinstitute.org/register/user/v1",
   },
-  termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
   text: MDX.RenderComponent({ Component: MDX.LoginText }),
   title: "Sign in to your account",
   warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

diff --git a/explorer/site-config/anvil/dev/authentication/authentication.ts b/explorer/site-config/anvil/dev/authentication/authentication.ts
@@ -7,6 +7,10 @@ export const authenticationConfig: AuthenticationConfig = {
     googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo",
     scope:
       "https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid",
+  },
+  terraAuthConfig: {
+    terraNIHProfileEndpoint:
+      "https://firecloud-orchestration.dsde-prod.broadinstitute.org/api/nih/status",
     terraProfileEndpoint:
       "https://sam.dsde-prod.broadinstitute.org/register/user/v1",
   },