From f7824149b0566f940cbbec6a092778063630f5df Mon Sep 17 00:00:00 2001 From: Dimitris Klouvas Date: Tue, 10 Oct 2023 19:30:56 +0300 Subject: [PATCH 1/2] chore(backend,clerk-sdk-node): Fix always showing deprecation warning for frontendApi --- packages/backend/src/tokens/factory.ts | 2 +- packages/sdk-node/src/authenticateRequest.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/tokens/factory.ts b/packages/backend/src/tokens/factory.ts index 3da4484f2e3..a3a640c276f 100644 --- a/packages/backend/src/tokens/factory.ts +++ b/packages/backend/src/tokens/factory.ts @@ -104,7 +104,7 @@ export function createAuthenticateRequest(params: CreateAuthenticateRequestOptio apiUrl, frontendApi: runtimeFrontendApi || buildtimeFrontendApi, publishableKey: runtimePublishableKey || buildtimePublishableKey, - proxyUrl: (runtimeProxyUrl || buildProxyUrl) as any, + proxyUrl: runtimeProxyUrl || buildProxyUrl, isSatellite: runtimeIsSatellite || buildtimeIsSatellite, domain: (runtimeDomain || buildtimeDomain) as any, userAgent: runtimeUserAgent || buildUserAgent, diff --git a/packages/sdk-node/src/authenticateRequest.ts b/packages/sdk-node/src/authenticateRequest.ts index d737e82f8f0..f4acb718101 100644 --- a/packages/sdk-node/src/authenticateRequest.ts +++ b/packages/sdk-node/src/authenticateRequest.ts @@ -20,7 +20,9 @@ export async function loadInterstitial({ */ if (requestState.publishableKey || requestState.frontendApi) { return clerkClient.localInterstitial({ - frontendApi: requestState.frontendApi, + // Use frontendApi only when legacy frontendApi is used to avoid showing deprecation warning + // since the requestState always contains the frontendApi constructed by publishableKey. + frontendApi: requestState.publishableKey ? '' : requestState.frontendApi, publishableKey: requestState.publishableKey, proxyUrl: requestState.proxyUrl, signInUrl: requestState.signInUrl, From 3bb935df308d7edf520e48de63f7cbf38de79535 Mon Sep 17 00:00:00 2001 From: Dimitris Klouvas Date: Tue, 10 Oct 2023 19:31:17 +0300 Subject: [PATCH 2/2] chore(clerk-sdk-node): Fix always showing deprecation warning for apiKey --- .changeset/tasty-toes-pump.md | 6 ++++++ packages/sdk-node/src/utils.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/tasty-toes-pump.md diff --git a/.changeset/tasty-toes-pump.md b/.changeset/tasty-toes-pump.md new file mode 100644 index 00000000000..fcf233e0bc9 --- /dev/null +++ b/.changeset/tasty-toes-pump.md @@ -0,0 +1,6 @@ +--- +'@clerk/clerk-sdk-node': patch +'@clerk/backend': patch +--- + +Avoid always showing deprecation warnings for `frontendApi` and `apiKey` in `@clerk/clerk-sdk-node` diff --git a/packages/sdk-node/src/utils.ts b/packages/sdk-node/src/utils.ts index 85b379e25d5..3500666ffef 100644 --- a/packages/sdk-node/src/utils.ts +++ b/packages/sdk-node/src/utils.ts @@ -26,7 +26,7 @@ export const loadClientEnv = () => { export const loadApiEnv = () => { return { secretKey: process.env.CLERK_SECRET_KEY || process.env.CLERK_API_KEY || '', - apiKey: process.env.CLERK_SECRET_KEY || process.env.CLERK_API_KEY || '', + apiKey: process.env.CLERK_API_KEY || '', apiUrl: process.env.CLERK_API_URL || 'https://api.clerk.dev', apiVersion: process.env.CLERK_API_VERSION || 'v1', domain: process.env.CLERK_DOMAIN || '',