Skip to content

Commit 8dd7ef4

Browse files
frano-mFran McDade
andauthored
feat: implement bottom half of Terra account nag indicating the NIH account (#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]>
1 parent 24b6f2a commit 8dd7ef4

File tree

6 files changed

+27
-11
lines changed

6 files changed

+27
-11
lines changed

explorer/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

explorer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts"
3434
},
3535
"dependencies": {
36-
"@clevercanary/data-explorer-ui": "0.44.0",
36+
"@clevercanary/data-explorer-ui": "0.45.0",
3737
"@emotion/react": "11.11.1",
3838
"@emotion/styled": "11.11.0",
3939
"@mdx-js/loader": "^2.3.0",

explorer/site-config/anvil-cmg/cc-dev/authentication/authentication.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
88
googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo",
99
scope:
1010
"https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid",
11+
},
12+
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
13+
terraAuthConfig: {
14+
terraNIHProfileEndpoint:
15+
"https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
1116
terraProfileEndpoint:
1217
"https://sam.dsde-dev.broadinstitute.org/register/user/v1",
1318
},
14-
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
1519
text: MDX.RenderComponent({ Component: MDX.LoginText }),
1620
title: "Sign in to your account",
1721
warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

explorer/site-config/anvil-cmg/dev/authentication/authentication.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
88
googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo",
99
scope:
1010
"https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid",
11+
},
12+
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
13+
terraAuthConfig: {
14+
terraNIHProfileEndpoint:
15+
"https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
1116
terraProfileEndpoint:
1217
"https://sam.dsde-prod.broadinstitute.org/register/user/v1",
1318
},
14-
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
1519
text: MDX.RenderComponent({ Component: MDX.LoginText }),
1620
title: "Sign in to your account",
1721
warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

explorer/site-config/anvil-cmg/prod/authentication/authentication.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ export const authenticationConfig: AuthenticationConfig = {
88
googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo",
99
scope:
1010
"https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid",
11+
},
12+
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
13+
terraAuthConfig: {
14+
terraNIHProfileEndpoint:
15+
"https://firecloud-orchestration.dsde-dev.broadinstitute.org/api/nih/status",
1116
terraProfileEndpoint:
1217
"https://sam.dsde-dev.broadinstitute.org/register/user/v1",
1318
},
14-
termsOfService: MDX.RenderComponent({ Component: MDX.LoginTermsOfService }),
1519
text: MDX.RenderComponent({ Component: MDX.LoginText }),
1620
title: "Sign in to your account",
1721
warning: MDX.RenderComponent({ Component: MDX.LoginWarning }),

explorer/site-config/anvil/dev/authentication/authentication.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ export const authenticationConfig: AuthenticationConfig = {
77
googleProfileEndpoint: "https://www.googleapis.com/oauth2/v3/userinfo",
88
scope:
99
"https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile openid",
10+
},
11+
terraAuthConfig: {
12+
terraNIHProfileEndpoint:
13+
"https://firecloud-orchestration.dsde-prod.broadinstitute.org/api/nih/status",
1014
terraProfileEndpoint:
1115
"https://sam.dsde-prod.broadinstitute.org/register/user/v1",
1216
},

0 commit comments

Comments
 (0)