Skip to content

fix(clerk-js): Simplify FAPI checks in ClerkJS #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SokratisVidros merged 1 commit into from
Nov 3, 2022
Merged

fix(clerk-js): Simplify FAPI checks in ClerkJS #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/clerk-js/src/utils/instance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/utils/instance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down