From 6a43c8e80318f1ef3e09c3337e342b0b3ad3dae1 Mon Sep 17 00:00:00 2001
From: Sokratis Vidros <sokratis.vidros@gmail.com>
Date: Tue, 1 Nov 2022 13:39:55 +0100
Subject: [PATCH] fix(clerk-js): Simplify FAPI checks in ClerkJS

---
 packages/clerk-js/src/utils/instance.test.ts | 7 ++++++-
 packages/clerk-js/src/utils/instance.ts      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/clerk-js/src/utils/instance.test.ts b/packages/clerk-js/src/utils/instance.test.ts
index 12059a5c1c9..22e18d97ffb 100644
--- a/packages/clerk-js/src/utils/instance.test.ts
+++ b/packages/clerk-js/src/utils/instance.test.ts
@@ -16,7 +16,12 @@ describe('validateFrontendApi(str)', () => {
     ['clerk.abcef.12345.dev.lclclerk.com', true],
     ['clerk.abcef.12345.stg.lclclerk.com', true],
     ['clerk.abcef.12345.prod.lclclerk.com', true],
-    ['clerk.abc.123.prod.lclclerk.com', true],
+    ['clerk.prod.lclclerk.com', true],
+    ['clerk.dev.lclclerk.com', true],
+    ['clerk.api.example1-do_main.com', true],
+    ['clerk.example1-do_main.com', true],
+    ['clerk.com', false],
+    ['whatever.com', false],
   ])('validates the frontendApi format', (str, expected) => {
     expect(validateFrontendApi(str)).toBe(expected);
   });
diff --git a/packages/clerk-js/src/utils/instance.ts b/packages/clerk-js/src/utils/instance.ts
index 47777ff3181..f6c4f40b51c 100644
--- a/packages/clerk-js/src/utils/instance.ts
+++ b/packages/clerk-js/src/utils/instance.ts
@@ -1,8 +1,8 @@
 import { isDevOrStagingUrl } from './url';
 
-const FRONTEND_API_DEV_OR_STG_REGEX = /^clerk\.\w+\.[\w-]+\.(\w+.){1,2}(dev|com)$/i;
+const FRONTEND_API_DEV_OR_STG_REGEX = /^clerk\.(\w+\.){2,4}(dev|com)$/i;
 
-const FRONTEND_API_PROD_REGEX = /^clerk(\.[-a-zA-Z0-9@:%_+~#=]{1,256}){2,}$/i;
+const FRONTEND_API_PROD_REGEX = /^clerk(\.[A-Z0-9_-]{1,256}){2,}$/i;
 
 export function validateFrontendApi(frontendApi: string | null | undefined): boolean {
   if (!frontendApi) {