fix(@aws-amplify/auth): Adjust Cognito error message checking for dis… (

aws-amplify#4546) * fix(@aws-amplify/auth): Adjust Cognito error message checking for disabled user. Fixes aws-amplify#4544 * Fix unit test
kgpasta · Dec 18, 2019 · 2d4d24b · 2d4d24b
1 parent 3a9583d
commit 2d4d24b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 37 deletions.
diff --git a/packages/auth/__tests__/auth-unit-test.ts b/packages/auth/__tests__/auth-unit-test.ts
@@ -500,12 +500,11 @@ describe('auth unit test', () => {
 
 			await auth.confirmSignUp('username', code);
 
-			expect(await CognitoUser.prototype.confirmRegistration).toBeCalledWith(
-				code,
-				jasmine.any(Boolean),
-				jasmine.any(Function),
-				{ foo: 'bar' }
-			);
+			expect(
+				await CognitoUser.prototype.confirmRegistration
+			).toBeCalledWith(code, jasmine.any(Boolean), jasmine.any(Function), {
+				foo: 'bar',
+			});
 			spyon.mockClear();
 		});
 
@@ -518,12 +517,11 @@ describe('auth unit test', () => {
 				clientMetadata: { custom: 'value' },
 			});
 
-			expect(await CognitoUser.prototype.confirmRegistration).toBeCalledWith(
-				code,
-				jasmine.any(Boolean),
-				jasmine.any(Function),
-				{ custom: 'value' }
-			);
+			expect(
+				await CognitoUser.prototype.confirmRegistration
+			).toBeCalledWith(code, jasmine.any(Boolean), jasmine.any(Function), {
+				custom: 'value',
+			});
 			spyon.mockClear();
 		});
 
@@ -607,10 +605,9 @@ describe('auth unit test', () => {
 
 			await auth.resendSignUp('username');
 
-			expect(await CognitoUser.prototype.resendConfirmationCode).toBeCalledWith(
-				jasmine.any(Function),
-				{ foo: 'bar' }
-			);
+			expect(
+				await CognitoUser.prototype.resendConfirmationCode
+			).toBeCalledWith(jasmine.any(Function), { foo: 'bar' });
 			spyon.mockClear();
 		});
 
@@ -620,10 +617,9 @@ describe('auth unit test', () => {
 
 			await auth.resendSignUp('username', { custom: 'value' });
 
-			expect(await CognitoUser.prototype.resendConfirmationCode).toBeCalledWith(
-				jasmine.any(Function),
-				{ custom: 'value' }
-			);
+			expect(
+				await CognitoUser.prototype.resendConfirmationCode
+			).toBeCalledWith(jasmine.any(Function), { custom: 'value' });
 			spyon.mockClear();
 		});
 
@@ -753,13 +749,13 @@ describe('auth unit test', () => {
 			const spyon2 = jest
 				.spyOn(auth, 'currentUserPoolUser')
 				.mockImplementationOnce(() => {
-					return Promise.reject('User is disabled');
+					return Promise.reject('User is disabled.');
 				});
 			expect.assertions(2);
 			try {
 				await auth.signIn('username', 'password');
 			} catch (e) {
-				expect(e).toBe('User is disabled');
+				expect(e).toBe('User is disabled.');
 				expect(spyon2).toBeCalled();
 			}
 
@@ -2000,12 +1996,11 @@ describe('auth unit test', () => {
 
 			await auth.changePassword(user, oldPassword, newPassword);
 
-			expect(await CognitoUser.prototype.changePassword).toBeCalledWith(
-				oldPassword,
-				newPassword,
-				jasmine.any(Function),
-				{ foo: 'bar' }
-			);
+			expect(
+				await CognitoUser.prototype.changePassword
+			).toBeCalledWith(oldPassword, newPassword, jasmine.any(Function), {
+				foo: 'bar',
+			});
 			spyon.mockClear();
 		});
 
@@ -2023,12 +2018,11 @@ describe('auth unit test', () => {
 				custom: 'value',
 			});
 
-			expect(await CognitoUser.prototype.changePassword).toBeCalledWith(
-				oldPassword,
-				newPassword,
-				jasmine.any(Function),
-				{ custom: 'value' }
-			);
+			expect(
+				await CognitoUser.prototype.changePassword
+			).toBeCalledWith(oldPassword, newPassword, jasmine.any(Function), {
+				custom: 'value',
+			});
 			spyon.mockClear();
 		});
 	});
@@ -3092,7 +3086,7 @@ describe('auth unit test', () => {
 				.mockImplementationOnce(callback => {
 					callback(
 						{
-							message: 'User is disabled',
+							message: 'User is disabled.',
 						},
 						null
 					);
@@ -3115,7 +3109,7 @@ describe('auth unit test', () => {
 				await auth.currentUserPoolUser();
 			} catch (e) {
 				expect(e).toEqual({
-					message: 'User is disabled',
+					message: 'User is disabled.',
 				});
 			}
 

diff --git a/packages/auth/src/Auth.ts b/packages/auth/src/Auth.ts
@@ -1129,7 +1129,7 @@ export default class AuthClass {
 										logger.debug('getting user data failed', err);
 										// Make sure the user is still valid
 										if (
-											err.message === 'User is disabled' ||
+											err.message === 'User is disabled.' ||
 											err.message === 'User does not exist.' ||
 											err.message === 'Access Token has been revoked' // Session revoked by another app
 										) {