From 010589efa92e89331c4ec6695c044b1b43d09f68 Mon Sep 17 00:00:00 2001 From: Laurin Quast Date: Mon, 11 Nov 2024 13:45:53 +0100 Subject: [PATCH 1/2] chore: upgrade supertokens-node to 17.x.x --- packages/services/api/package.json | 2 +- packages/services/server/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/services/api/package.json b/packages/services/api/package.json index 55e1c73e20..cd49e83682 100644 --- a/packages/services/api/package.json +++ b/packages/services/api/package.json @@ -60,7 +60,7 @@ "prom-client": "15.1.3", "redlock": "5.0.0-beta.2", "slonik": "30.4.4", - "supertokens-node": "16.7.5", + "supertokens-node": "17.1.4", "tslib": "2.8.0", "undici": "6.20.1", "vitest": "2.0.5", diff --git a/packages/services/server/package.json b/packages/services/server/package.json index b09fa97c29..b1fd6b3be8 100644 --- a/packages/services/server/package.json +++ b/packages/services/server/package.json @@ -46,7 +46,7 @@ "prom-client": "15.1.3", "reflect-metadata": "0.2.2", "supertokens-js-override": "0.0.4", - "supertokens-node": "16.7.5", + "supertokens-node": "17.1.4", "tslib": "2.8.0", "zod": "3.23.8" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d90e7ac7d1..b847ed9300 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -796,8 +796,8 @@ importers: specifier: 30.4.4 version: 30.4.4(patch_hash=jxrvl4xmdvyktjijg7yfdkb34i) supertokens-node: - specifier: 16.7.5 - version: 16.7.5(encoding@0.1.13) + specifier: 17.1.4 + version: 17.1.4(encoding@0.1.13) tslib: specifier: 2.8.0 version: 2.8.0 @@ -1250,8 +1250,8 @@ importers: specifier: 0.0.4 version: 0.0.4 supertokens-node: - specifier: 16.7.5 - version: 16.7.5(encoding@0.1.13) + specifier: 17.1.4 + version: 17.1.4(encoding@0.1.13) tslib: specifier: 2.8.0 version: 2.8.0 @@ -14700,8 +14700,8 @@ packages: supertokens-js-override@0.0.4: resolution: {integrity: sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg==} - supertokens-node@16.7.5: - resolution: {integrity: sha512-xrVwi0GfgLIqHKaWXEp7fCgmVQ2wTiJTHG2CQGLkGMvrO9dUcxY+H6qozn3EvyXxbkm1BmflYD8N7ILNSIbR1g==} + supertokens-node@17.1.4: + resolution: {integrity: sha512-Bz7NphZmS9H9VpV3gbooKjl+mfBja3RxAkXRjS8TqQLYaGy3zch6OdgRsdi7gBqahyM+IXEKGk7sdJWHZjVmOQ==} supertokens-web-js@0.9.0: resolution: {integrity: sha512-7DucVUWxImrcjckza0oW6tkPfMzScj8V/qiQNZeUT/EfCqIbslNSO8holBHc9Eykc0vG/CC0d9ne5TRhAmRcxg==} @@ -32233,7 +32233,7 @@ snapshots: supertokens-js-override@0.0.4: {} - supertokens-node@16.7.5(encoding@0.1.13): + supertokens-node@17.1.4(encoding@0.1.13): dependencies: content-type: 1.0.5 cookie: 0.7.2 From 34239a042ab79858c25a8268dacb17e6f740d3ba Mon Sep 17 00:00:00 2001 From: Laurin Quast Date: Mon, 11 Nov 2024 13:52:05 +0100 Subject: [PATCH 2/2] fix: use unique enough string instead of symbol --- packages/services/server/src/supertokens/oidc-provider.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/services/server/src/supertokens/oidc-provider.ts b/packages/services/server/src/supertokens/oidc-provider.ts index 66ffeab793..044965a1f5 100644 --- a/packages/services/server/src/supertokens/oidc-provider.ts +++ b/packages/services/server/src/supertokens/oidc-provider.ts @@ -5,7 +5,7 @@ import type { TypeInput as ThirdPartEmailPasswordTypeInput } from 'supertokens-n import zod from 'zod'; import { createInternalApiCaller } from '../api'; -const couldNotResolveOidcIntegrationSymbol = Symbol('could_not_resolve_oidc_integration'); +const couldNotResolveOidcIntegrationBrand = '[graphql_hive]err_could_not_resolve_oidc_integration'; type InternalApiCaller = ReturnType; @@ -14,7 +14,7 @@ export const getOIDCSuperTokensOverrides = (): ThirdPartEmailPasswordTypeInput[' return { ...originalImplementation, async authorisationUrlGET(input) { - if (input.userContext?.[couldNotResolveOidcIntegrationSymbol] === true) { + if (input.userContext?.[couldNotResolveOidcIntegrationBrand] === true) { return { status: 'GENERAL_ERROR', message: 'Could not find OIDC integration.', @@ -48,7 +48,7 @@ export const createOIDCSuperTokensProvider = (args: { // In the next step the override `authorisationUrlGET` from `getOIDCSuperTokensOverrides` is called. // We use the user context to return a `GENERAL_ERROR` with a human readable message. // We cannot return an error here (except an "Unexpected error"), so we also need to return fake dat - input.userContext[couldNotResolveOidcIntegrationSymbol] = true; + input.userContext[couldNotResolveOidcIntegrationBrand] = true; return { thirdPartyId: 'oidc',