Merge branch 'main' into fix/ver-json5

.github/canary-config/canary-all.yml

@@ -86,6 +86,8 @@ tests:
     sample_name: [related-models]
     spec: related-models
     browser: *minimal_browser_list
+    timeout_minutes: 45
+    retry_count: 10
   - test_name: integ_react_datastore_selective_sync
     desc: 'DataStore - Selective Sync'
     framework: react
@@ -123,6 +125,8 @@ tests:
     sample_name: [next-13-js]
     spec: nextjs-13
     browser: *minimal_browser_list
+    timeout_minutes: 45
+    retry_count: 10
   - test_name: integ_rollup_datastore_basic_crud
     desc: 'Rollup + DataStore - Basic CRUD'
     framework: rollup

.github/workflows/callable-canary-e2e.yml

@@ -42,7 +42,5 @@ jobs:
           WEBHOOK_URL: ${{ env.WEBHOOK_URL }}
         run: |
           curl -X POST -H "Content-Type: application/json" \
-          --data '{"URL":"$WORKFLOW_URL"}' \
+          --data {URL:$WORKFLOW_URL} \
           $WEBHOOK_URL
-         
-        

.github/workflows/on-schedule-canary-test.yml

@@ -1,7 +1,8 @@
 on:
-  # Tests scheduled for every 1 hour
+  # Tests scheduled at 4pm(UTC) / 9am(PDT) everyday
+  # default supported timezone is UTC
   schedule:
-  - cron: '0 */1 * * *'
+    - cron: '0 16 * * *'
 
 jobs:
   canaries:

packages/amazon-cognito-identity-js/__tests__/CognitoUser.test.js

@@ -203,7 +203,7 @@ describe('authenticateUser()', () => {
 		user.setAuthenticationFlowType('USER_PASSWORD_AUTH');
 		user.authenticateUser(authDetails, callback);
 
-		expect(spyon).toHaveBeenCalledWith(authDetails, callback);
+		expect(spyon).toHaveBeenCalledWith(authDetails, callback, undefined);
 	});
 
 	test('USER_SRP_AUTH and CUSTOM_AUTH flow types', () => {
@@ -212,12 +212,12 @@ describe('authenticateUser()', () => {
 		user.setAuthenticationFlowType('USER_SRP_AUTH');
 		user.authenticateUser(authDetails, callback);
 
-		expect(spyon).toHaveBeenCalledWith(authDetails, callback);
+		expect(spyon).toHaveBeenCalledWith(authDetails, callback, undefined);
 
 		user.setAuthenticationFlowType('CUSTOM_AUTH');
 		user.authenticateUser(authDetails, callback);
 
-		expect(spyon).toHaveBeenCalledWith(authDetails, callback);
+		expect(spyon).toHaveBeenCalledWith(authDetails, callback, undefined);
 	});
 
 	test('throws error for invalid Authentication flow type', () => {
@@ -310,7 +310,8 @@ describe('authenticateUserPlainUsernamePassword()', () => {
 		expect(userSpy3).toBeCalledWith(
 			'test auth result',
 			userSpy3.mock.calls[0][1],
-			callback
+			callback,
+			undefined
 		);
 		expect(userSpy3.mock.results[0].value).toBe('test return value');
 	});
@@ -755,7 +756,8 @@ describe('sendCustomChallengeAnswer()', () => {
 		expect(spyon3).toBeCalledWith(
 			vCognitoUserSession,
 			expect.any(AuthenticationHelper),
-			callback
+			callback,
+			undefined
 		);
 	});
 
@@ -1176,33 +1178,33 @@ describe('confirmPassword() and forgotPassword()', () => {
 		jest.clearAllMocks();
 	});
 
-	test('happy path should callback onSuccess', () => {
+	test('confirmPassword happy path should callback onSuccess', () => {
 		netRequestMockSuccess(true);
 		cognitoUser.confirmPassword(...confirmPasswordDefaults);
 		expect(callback.onSuccess).toHaveBeenCalledWith('SUCCESS');
 	});
 
-	test('client request throws an error', () => {
+	test('confirmPassword client request throws an error', () => {
 		netRequestMockSuccess(false);
 		cognitoUser.confirmPassword(...confirmPasswordDefaults);
 		expect(callback.onFailure.mock.calls.length).toEqual(1);
 	});
 
-	test('happy path should callback onSuccess', () => {
+	test('forgotPassword happy path should callback onSuccess', () => {
 		callback.inputVerificationCode = null;
 		netRequestMockSuccess(true);
 		cognitoUser.forgotPassword(...forgotPasswordDefaults);
 		expect(callback.onSuccess.mock.calls.length).toEqual(1);
 	});
 
-	test('inputVerification code is a function should callback inputVerificationCode', () => {
+	test('forgotPassword inputVerification code is a function should callback inputVerificationCode', () => {
 		callback.inputVerificationCode = jest.fn();
 		netRequestMockSuccess(true);
 		cognitoUser.forgotPassword(...forgotPasswordDefaults);
 		expect(callback.inputVerificationCode.mock.calls.length).toEqual(1);
 	});
 
-	test('client returning an error should call onFailure', () => {
+	test('forgotPassword client returning an error should call onFailure', () => {
 		netRequestMockSuccess(false);
 		cognitoUser.forgotPassword(...forgotPasswordDefaults);
 		expect(callback.onFailure.mock.calls.length).toEqual(1);

packages/amazon-cognito-identity-js/__tests__/internalsIndex.test.js

@@ -6,6 +6,7 @@ describe('import * keys', () => {
 		Array [
 		  "addAuthCategoryToCognitoUserAgent",
 		  "addFrameworkToCognitoUserAgent",
+		  "InternalCognitoUser",
 		]
 	`);
 	});