@aws-amplify/auth 5.1.6 → 5.1.7-push-notification-dryrun.43

package/src/Auth.ts

@@ -159,9 +159,10 @@ export class AuthClass {
 			identityPoolRegion,
 			clientMetadata,
 			endpoint,
+			storage,
 		} = this._config;
 
-		if (!this._config.storage) {
+		if (!storage) {
 			// backward compatability
 			if (cookieStorage) this._storage = new CookieStorage(cookieStorage);
 			else {
@@ -170,11 +171,11 @@ export class AuthClass {
 					: new StorageHelper().getStorage();
 			}
 		} else {
-			if (!this._isValidAuthStorage(this._config.storage)) {
+			if (!this._isValidAuthStorage(storage)) {
 				logger.error('The storage in the Auth config is not valid!');
 				throw new Error('Empty storage object');
 			}
-			this._storage = this._config.storage;
+			this._storage = storage;
 		}
 
 		this._storageSync = Promise.resolve();
@@ -203,7 +204,7 @@ export class AuthClass {
 			identityPoolId,
 			refreshHandlers,
 			storage: this._storage,
-			identityPoolRegion
+			identityPoolRegion,
 		});
 
 		// initialize cognitoauth client if hosted ui options provided
@@ -1131,6 +1132,13 @@ export class AuthClass {
 		challengeAnswer: string
 	): Promise<CognitoUserSession> {
 		logger.debug('verification totp token', user, challengeAnswer);
+
+		let signInUserSession;
+		if (user && typeof user.getSignInUserSession === 'function') {
+			signInUserSession = (user as CognitoUser).getSignInUserSession();
+		}
+		const isLoggedIn = signInUserSession?.isValid();
+
 		return new Promise((res, rej) => {
 			user.verifySoftwareToken(challengeAnswer, 'My TOTP device', {
 				onFailure: err => {
@@ -1139,7 +1147,13 @@ export class AuthClass {
 					return;
 				},
 				onSuccess: data => {
-					dispatchAuthEvent('signIn', user, `A user ${user.getUsername()} has been signed in`);
+					if (!isLoggedIn) {
+						dispatchAuthEvent(
+							'signIn',
+							user,
+							`A user ${user.getUsername()} has been signed in`
+						);
+					}
 					dispatchAuthEvent(
 						'verify',
 						user,
@@ -1183,7 +1197,12 @@ export class AuthClass {
 							logger.debug('cannot get cognito credentials', e);
 						} finally {
 							that.user = user;
-
+							try {
+								const currentUser = await this.currentUserPoolUser();
+								user.attributes = currentUser.attributes;
+							} catch (e) {
+								logger.debug('cannot get updated Cognito User', e);
+							}
 							dispatchAuthEvent(
 								'signIn',
 								user,
@@ -1428,15 +1447,23 @@ export class AuthClass {
 				user.updateAttributes(
 					attributeList,
 					(err, result, details) => {
-						
 						if (err) {
-							dispatchAuthEvent('updateUserAttributes_failure', err, 'Failed to update attributes');
+							dispatchAuthEvent(
+								'updateUserAttributes_failure',
+								err,
+								'Failed to update attributes'
+							);
 							return reject(err);
 						} else {
 							const attrs = this.createUpdateAttributesResultList(
-								attributes as Record<string, string>, details?.CodeDeliveryDetailsList
+								attributes as Record<string, string>,
+								details?.CodeDeliveryDetailsList
+							);
+							dispatchAuthEvent(
+								'updateUserAttributes',
+								attrs,
+								'Attributes successfully updated'
 							);
-							dispatchAuthEvent('updateUserAttributes', attrs, 'Attributes successfully updated');
 							return resolve(result);
 						}
 					},
@@ -1447,15 +1474,17 @@ export class AuthClass {
 	}
 
 	private createUpdateAttributesResultList(
-		attributes: Record<string, string>, 
-		codeDeliveryDetailsList?: CodeDeliveryDetails []
+		attributes: Record<string, string>,
+		codeDeliveryDetailsList?: CodeDeliveryDetails[]
 	): Record<string, string> {
 		const attrs = {};
 		Object.keys(attributes).forEach(key => {
 			attrs[key] = {
-				isUpdated: true
+				isUpdated: true,
 			};
-			const codeDeliveryDetails = codeDeliveryDetailsList?.find(value => value.AttributeName === key);
+			const codeDeliveryDetails = codeDeliveryDetailsList?.find(
+				value => value.AttributeName === key
+			);
 			if (codeDeliveryDetails) {
 				attrs[key].isUpdated = false;
 				attrs[key].codeDeliveryDetails = codeDeliveryDetails;

package/src/OAuth/OAuth.ts

@@ -233,7 +233,7 @@ export default class OAuth {
 				return { ...(await this._handleImplicitFlow(currentUrl)), state };
 			}
 		} catch (e) {
-			logger.error(`Error handling auth response.`, e);
+			logger.debug(`Error handling auth response.`, e);
 			throw e;
 		}
 	}