Skip to content
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

Fix Typescript compilation for 4.6.3 #812

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Typescript compilation for 4.6.3 #812

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
19 changes: 15 additions & 4 deletions src/utils.tsx
View file
Open in desktop
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