Skip to content
Closed
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
19 changes: 15 additions & 4 deletions src/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ const CODE_RE = /[?&]code=[^&]+/;
const STATE_RE = /[?&]state=[^&]+/;
const ERROR_RE = /[?&]error=[^&]+/;

interface WithError {
error: string;
}

interface WithErrorAndDescription {
error: string;
error_description: string;
}

export const hasAuthParams = (searchParams = window.location.search): boolean =>
(CODE_RE.test(searchParams) || ERROR_RE.test(searchParams)) &&
STATE_RE.test(searchParams);
Expand All @@ -19,15 +28,17 @@ const normalizeErrorFn =
error !== null &&
typeof error === 'object' &&
'error' in error &&
typeof error.error === 'string'
typeof (error as WithError).error === 'string'
) {
if (
'error_description' in error &&
typeof error.error_description === 'string'
typeof (error as WithErrorAndDescription).error_description === 'string'
) {
return new OAuthError(error.error, error.error_description);
const e = error as WithErrorAndDescription;
return new OAuthError(e.error, e.error_description);
}
return new OAuthError(error.error);
const e = error as WithError;
return new OAuthError(e.error);
}
return new Error(fallbackMessage);
};
Expand Down
Loading