fix(social): show account linking page for guest users attempting to …

…sign in with social
guardian · May 23, 2024 · dc4e5e0 · dc4e5e0
1 parent 4c5aadf
commit dc4e5e0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/src/client/pages/SignIn.tsx b/src/client/pages/SignIn.tsx
@@ -56,12 +56,30 @@ const Links = ({ children }: { children: React.ReactNode }) => (
 	</div>
 );
 
-const getErrorContext = (error: string | undefined) => {
+const getErrorContext = (
+	error: string | undefined,
+	queryParams: QueryParams,
+) => {
 	if (error === SignInErrors.ACCOUNT_ALREADY_EXISTS) {
 		return (
 			<>
-				We cannot sign you in with your social account credentials. Please enter
-				your account password below to sign in.
+				<div>
+					We cannot sign you in with your social account credentials. Please
+					enter your account password below to sign in. If you do not know your
+					password, you can{' '}
+					<Link
+						href={buildUrlWithQueryParams('/reset-password', {}, queryParams)}
+					>
+						reset it here
+					</Link>
+					.
+				</div>
+				<br />
+				<div>
+					If you are still having trouble, please contact our customer service
+					team at{' '}
+					<Link href={locations.SUPPORT_EMAIL_MAILTO}>{SUPPORT_EMAIL}</Link>.
+				</div>
 			</>
 		);
 	} else if (error === RegistrationErrors.PROVISIONING_FAILURE) {
@@ -129,7 +147,7 @@ export const SignIn = ({
 	return (
 		<MainLayout
 			errorOverride={pageError}
-			errorContext={getErrorContext(pageError)}
+			errorContext={getErrorContext(pageError, queryParams)}
 			tabs={tabs}
 			errorSmallMarginBottom={!!pageError}
 			pageHeader="Sign in"
@@ -139,7 +157,7 @@ export const SignIn = ({
 			{showAuthProviderButtons(socialSigninBlocked, queryParams, isJobs)}
 			<MainForm
 				formErrorMessageFromParent={formError}
-				formErrorContextFromParent={getErrorContext(formError)}
+				formErrorContextFromParent={getErrorContext(formError, queryParams)}
 				formAction={buildUrlWithQueryParams(
 					isReauthenticate ? '/reauthenticate' : '/signin',
 					{},

diff --git a/src/server/routes/oauth.ts b/src/server/routes/oauth.ts
@@ -801,8 +801,9 @@ router.get(
 			// and redirect to the sign in page with the social sign in blocked error
 			if (
 				callbackParams.error === OpenIdErrors.ACCESS_DENIED &&
-				callbackParams.error_description ===
-					OpenIdErrorDescriptions.ACCOUNT_LINKING_DENIED_GROUPS
+				(callbackParams.error_description ===
+					OpenIdErrorDescriptions.ACCOUNT_LINKING_DENIED_GROUPS ||
+					OpenIdErrorDescriptions.USER_STATUS_INVALID)
 			) {
 				trackMetric('OAuthAuthorization::Failure');
 				return res.redirect(

diff --git a/src/shared/model/OpenIdErrors.ts b/src/shared/model/OpenIdErrors.ts
@@ -17,4 +17,5 @@ export enum OpenIdErrors {
 
 export enum OpenIdErrorDescriptions {
 	ACCOUNT_LINKING_DENIED_GROUPS = 'User linking was denied because the user is not in any of the specified groups.',
+	USER_STATUS_INVALID = 'User status is invalid.',
 }