fix(google-auth): catch and display errors (#1871)

Automattic · Aug 10, 2022 · e7ff9c3 · e7ff9c3
1 parent 923f8f3
commit e7ff9c3
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/assets/reader-activation/auth.js b/assets/reader-activation/auth.js
@@ -328,13 +328,26 @@ const convertFormDataToObject = ( formData, includedFields = [] ) =>
 			const checkLoginStatus = metadata => {
 				fetch(
 					`/wp-json/newspack/v1/login/google/register?metadata=${ JSON.stringify( metadata ) }`
-				).then( res => {
-					res.json().then( ( { message, data } ) => {
-						if ( googleLoginForm.endLoginFlow ) {
-							googleLoginForm.endLoginFlow( message, res.status, data );
+				)
+					.then( res => {
+						res
+							.json()
+							.then( ( { message, data } ) => {
+								if ( googleLoginForm?.endLoginFlow ) {
+									googleLoginForm.endLoginFlow( message, res.status, data );
+								}
+							} )
+							.catch( error => {
+								if ( googleLoginForm?.endLoginFlow ) {
+									googleLoginForm.endLoginFlow( error?.message );
+								}
+							} );
+					} )
+					.catch( error => {
+						if ( googleLoginForm?.endLoginFlow ) {
+							googleLoginForm.endLoginFlow( error?.message );
 						}
 					} );
-				} );
 			};
 
 			googleLoginElement.addEventListener( 'click', () => {
@@ -375,7 +388,7 @@ const convertFormDataToObject = ( formData, includedFields = [] ) =>
 					} )
 					.catch( error => {
 						if ( googleLoginForm?.endLoginFlow ) {
-							googleLoginForm.endLoginFlow( error.message );
+							googleLoginForm.endLoginFlow( error?.message );
 						}
 						if ( authWindow ) {
 							authWindow.close();