fix(clerk-sdk-node): Correctly throw Missing Clerk Secret Key or API …

…Key error
clerk · Jun 15, 2023 · f8a334b · f8a334b
1 parent ca1dcc3
commit f8a334b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.changeset/slow-falcons-design.md b/.changeset/slow-falcons-design.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-sdk-node': patch
+---
+
+Correctly display "Missing Clerk keys" error instead of simply throwing during initialization
diff --git a/packages/sdk-node/src/clerkClient.ts b/packages/sdk-node/src/clerkClient.ts
@@ -45,15 +45,21 @@ let clerkClientSingleton = {} as unknown as ReturnType<typeof Clerk>;
 
 export const clerkClient = new Proxy(clerkClientSingleton, {
   get(_target, property) {
+    const hasBeenInitialised = !!clerkClientSingleton.authenticateRequest;
+    if (hasBeenInitialised) {
+      // @ts-expect-error
+      return clerkClientSingleton[property];
+    }
+
     const env = { ...loadApiEnv(), ...loadClientEnv() };
     if (env.secretKey) {
-      clerkClientSingleton = Clerk({
-        ...env,
-        userAgent: '@clerk/clerk-sdk-node',
-      });
+      clerkClientSingleton = Clerk({ ...env, userAgent: '@clerk/clerk-sdk-node' });
+      // @ts-expect-error
+      return clerkClientSingleton[property];
     }
-    // @ts-ignore
-    return clerkClientSingleton[property];
+
+    // @ts-expect-error
+    return Clerk({ ...env, userAgent: '@clerk/clerk-sdk-node' })[property];
   },
   set() {
     return false;