Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/proud-coats-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@clerk/elements": patch
"@clerk/shared": patch
---

Fixes issue where errors were incorrectly being returned as an `any` type.
9 changes: 7 additions & 2 deletions packages/elements/src/internals/errors/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { MetamaskError } from '@clerk/shared';
import type { ClerkAPIError } from '@clerk/types';

export abstract class ClerkElementsErrorBase extends Error {
Expand All @@ -21,8 +22,12 @@ export abstract class ClerkElementsErrorBase extends Error {
}

export class ClerkElementsError extends ClerkElementsErrorBase {
static fromAPIError(error: ClerkAPIError) {
return new ClerkElementsError(error.code, error.longMessage || error.message);
static fromAPIError(error: ClerkAPIError | MetamaskError) {
return new ClerkElementsError(
error.code.toString(),
// @ts-expect-error - Expected that longMessage isn't a property of MetamaskError
error.longMessage || error.message,
);
}

constructor(code: string, message: string) {
Expand Down
16 changes: 11 additions & 5 deletions packages/elements/src/internals/machines/form/form.machine.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { isKnownError } from '@clerk/shared/error';
import { isClerkAPIResponseError, isKnownError, isMetamaskError } from '@clerk/shared/error';
import { snakeToCamel } from '@clerk/shared/underscore';
import type { ClerkAPIError } from '@clerk/types';
import type { MachineContext } from 'xstate';
import { assign, enqueueActions, setup } from 'xstate';

Expand Down Expand Up @@ -94,17 +95,22 @@ export const FormMachine = setup({
on: {
'ERRORS.SET': {
actions: enqueueActions(({ enqueue, event }) => {
const isClerkAPIError = (err: any): err is ClerkAPIError => 'meta' in err;

if (isKnownError(event.error)) {
const fields: Record<string, ClerkElementsFieldError[]> = {};
const globalErrors: ClerkElementsError[] = [];
const errors = isClerkAPIResponseError(event.error) ? event.error?.errors : [event.error];

for (const error of event.error.errors || [event.error]) {
const name = snakeToCamel(error.meta?.paramName);
for (const error of errors) {
const name = isClerkAPIError(error) ? snakeToCamel(error.meta?.paramName) : null;

if (!name) {
if (!name || isMetamaskError(error)) {
globalErrors.push(ClerkElementsError.fromAPIError(error));
continue;
} else if (!fields[name]) {
}

if (!fields[name]) {
fields[name] = [];
}

Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface MetamaskError extends Error {
data?: unknown;
}

export function isKnownError(error: any) {
export function isKnownError(error: any): error is ClerkAPIResponseError | ClerkRuntimeError | MetamaskError {
return isClerkAPIResponseError(error) || isMetamaskError(error) || isClerkRuntimeError(error);
}

Expand Down
Loading