Merge branch 'main' into ui-components/main

.circleci/config.yml

@@ -13,7 +13,7 @@ executors:
 
   js-test-executor:
     docker:
-      - image: cypress/base:12
+      - image: cypress/included:4.12.1
       - image: verdaccio/verdaccio
     resource_class: large
 

.circleci/retry-yarn-script.sh

@@ -21,8 +21,8 @@ done
 
 # initialize counter
 n=0
-# loop until n >= first param
-until [ "$n" -ge $N ]
+# loop until n > first param
+until [ "$n" -gt $N ]
 do
 	# $1 is the argument passed in, e.g. publish:verdaccio
 	# if the publish command succeeds, `break` exits the loop
@@ -34,10 +34,18 @@ do
   	echo "Resetting git HEAD"
 		git reset --hard
 	fi
-
+
+	if [ "$n" -eq $N ]; 
+	then
+		echo "Returning error"
+		exit 1
+	fi
+
 	# increment counter
 	n=$((n+1))
+
 	# wait 5 seconds
 	sleep 5
 	echo "Retry $n of $N"
-done
+done
+

packages/amazon-cognito-identity-js/src/CognitoUser.js

@@ -1979,14 +1979,14 @@ export default class CognitoUser {
 			this.Session = data.Session;
 			if (answerChallenge === 'SMS_MFA') {
 				return callback.mfaRequired(
-					data.challengeName,
-					data.challengeParameters
+					data.ChallengeName,
+					data.ChallengeParameters
 				);
 			}
 			if (answerChallenge === 'SOFTWARE_TOKEN_MFA') {
 				return callback.totpRequired(
-					data.challengeName,
-					data.challengeParameters
+					data.ChallengeName,
+					data.ChallengeParameters
 				);
 			}
 			return undefined;

packages/core/src/Credentials.ts

@@ -281,7 +281,42 @@ export class CredentialsClass {
 				return res;
 			})
 			.catch(async e => {
-				return e;
+				// If identity id is deleted in the console, we make one attempt to recreate it
+				// and remove existing id from cache.
+				if (
+					e.name === 'ResourceNotFoundException' &&
+					e.message === `Identity '${identityId}' not found.`
+				) {
+					logger.debug('Failed to load guest credentials');
+					this._storage.removeItem('CognitoIdentityId-' + identityPoolId);
+
+					const credentialsProvider: CredentialProvider = async () => {
+						const { IdentityId } = await cognitoClient.send(
+							new GetIdCommand({
+								IdentityPoolId: identityPoolId,
+							})
+						);
+						this._identityId = IdentityId;
+						const cognitoIdentityParams: FromCognitoIdentityParameters = {
+							client: cognitoClient,
+							identityId: IdentityId,
+						};
+
+						const credentialsFromCognitoIdentity = fromCognitoIdentity(
+							cognitoIdentityParams
+						);
+
+						return credentialsFromCognitoIdentity();
+					};
+
+					credentials = credentialsProvider().catch(async err => {
+						throw err;
+					});
+
+					return this._loadCredentials(credentials, 'guest', false, null);
+				} else {
+					return e;
+				}
 			});
 	}