diff --git a/package-lock.json b/package-lock.json index c3b4b76e4..9854fa48f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "explorer", "version": "3.0.1", "dependencies": { - "@databiosphere/findable-ui": "^51.1.0", + "@databiosphere/findable-ui": "^52.1.0", "@emotion/react": "^11", "@emotion/styled": "^11", "@mdx-js/loader": "^3", @@ -1110,9 +1110,9 @@ } }, "node_modules/@databiosphere/findable-ui": { - "version": "51.1.0", - "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-51.1.0.tgz", - "integrity": "sha512-aWy0zOOGim5xoJvWes1v/mqKSobBUlGmfZt4uIMp5f+oNKEFlAA27CSJ01SsbhWQKgpPdZT3f+kXxfYG0FDk+A==", + "version": "52.1.0", + "resolved": "https://registry.npmjs.org/@databiosphere/findable-ui/-/findable-ui-52.1.0.tgz", + "integrity": "sha512-kRZmj/Wd2UAfWxKwh0iJ3YYGLWim98s6q3c/P5rTGIsUgUSXuFFzEBfw2nxzP+B2OrE/MkqtnKH/y1pmUxG6lg==", "license": "Apache-2.0", "engines": { "node": "22.12.0" @@ -1136,7 +1136,6 @@ "react": "^19.2.3", "react-dom": "^19.2.3", "react-dropzone": "^14.3.8", - "react-gtm-module": "^2.0.11", "react-idle-timer": "^5.7.2", "react-window": "^1.8.11", "rehype-raw": "^7.0.0", diff --git a/package.json b/package.json index b2e4ca99c..7d5628b1d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts" }, "dependencies": { - "@databiosphere/findable-ui": "^51.1.0", + "@databiosphere/findable-ui": "^52.1.0", "@emotion/react": "^11", "@emotion/styled": "^11", "@mdx-js/loader": "^3", diff --git a/site-config/anvil-cmg/cc-dev/authentication/constants.ts b/site-config/anvil-cmg/cc-dev/authentication/constants.ts index 4a96cb855..d2b0a256a 100644 --- a/site-config/anvil-cmg/cc-dev/authentication/constants.ts +++ b/site-config/anvil-cmg/cc-dev/authentication/constants.ts @@ -1,4 +1,7 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; @@ -11,4 +14,5 @@ export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, clientId: CLIENT_ID, + flow: OAUTH_FLOW.IMPLICIT, }; diff --git a/site-config/anvil-cmg/dev/authentication/constants.ts b/site-config/anvil-cmg/dev/authentication/constants.ts index 4b0230c48..820d7a774 100644 --- a/site-config/anvil-cmg/dev/authentication/constants.ts +++ b/site-config/anvil-cmg/dev/authentication/constants.ts @@ -1,16 +1,21 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; import { OAUTH_GOOGLE_SIGN_IN } from "../../../common/authentication"; const CLIENT_ID = - "561542988117-9e04fhfrc9su130eb2ggea7bdppolkjq.apps.googleusercontent.com"; + "561542988117-3cv4g8ii9enl2000ra6m02r3ne7bgnth.apps.googleusercontent.com"; export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, + authorize: "https://service.anvil.gi.ucsc.edu/user/authorize", clientId: CLIENT_ID, + flow: OAUTH_FLOW.AUTHORIZATION_CODE, }; export const TERRA_SERVICE = { diff --git a/site-config/anvil-cmg/prod/authentication/constants.ts b/site-config/anvil-cmg/prod/authentication/constants.ts index 32d4ae204..31ae57023 100644 --- a/site-config/anvil-cmg/prod/authentication/constants.ts +++ b/site-config/anvil-cmg/prod/authentication/constants.ts @@ -1,4 +1,7 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; @@ -11,6 +14,7 @@ export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, clientId: CLIENT_ID, + flow: OAUTH_FLOW.IMPLICIT, }; export const TERRA_SERVICE = { diff --git a/site-config/anvil-cmg/tempdev/authentication/constants.ts b/site-config/anvil-cmg/tempdev/authentication/constants.ts index cde75587a..71034357c 100644 --- a/site-config/anvil-cmg/tempdev/authentication/constants.ts +++ b/site-config/anvil-cmg/tempdev/authentication/constants.ts @@ -1,4 +1,7 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; @@ -11,6 +14,7 @@ export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, clientId: CLIENT_ID, + flow: OAUTH_FLOW.IMPLICIT, }; export const TERRA_SERVICE = { diff --git a/site-config/hca-dcp/cc-ma-dev/authentication/constants.ts b/site-config/hca-dcp/cc-ma-dev/authentication/constants.ts index a13dc58d6..50ab95e03 100644 --- a/site-config/hca-dcp/cc-ma-dev/authentication/constants.ts +++ b/site-config/hca-dcp/cc-ma-dev/authentication/constants.ts @@ -1,4 +1,7 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; @@ -11,6 +14,7 @@ export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, clientId: CLIENT_ID, + flow: OAUTH_FLOW.IMPLICIT, }; export const TERRA_SERVICE = { diff --git a/site-config/hca-dcp/ma-prod/authentication/constants.ts b/site-config/hca-dcp/ma-prod/authentication/constants.ts index 5ff736f93..94f27dd07 100644 --- a/site-config/hca-dcp/ma-prod/authentication/constants.ts +++ b/site-config/hca-dcp/ma-prod/authentication/constants.ts @@ -1,4 +1,7 @@ -import { OAuthProvider } from "@databiosphere/findable-ui/lib/config/entities"; +import { + OAUTH_FLOW, + OAuthProvider, +} from "@databiosphere/findable-ui/lib/config/entities"; import { GOOGLE_SIGN_IN_PROVIDER } from "@databiosphere/findable-ui/lib/google/config"; import { GoogleProfile } from "@databiosphere/findable-ui/lib/google/types"; @@ -11,6 +14,7 @@ export const GOOGLE_PROVIDER: OAuthProvider = { ...GOOGLE_SIGN_IN_PROVIDER, ...OAUTH_GOOGLE_SIGN_IN, clientId: CLIENT_ID, + flow: OAUTH_FLOW.IMPLICIT, }; export const TERRA_SERVICE = {