Merge branch 'main' into feat/next-15/main

aws-amplify · Nov 5, 2024 · 7470547 · 7470547
2 parents 7992a88 + d6eede3
commit 7470547
Show file tree

Hide file tree

Showing 123 changed files with 4,293 additions and 1,546 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,24 +13,24 @@
 
 # The following paths involve server-side use cases, token/user session management.
 # Changes made to these paths requires additional reviews and approvals.
-/packages/auth @haverchuck @cshfang @jimblanc @HuiSF
-/packages/aws-amplify/src/adapter-core @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/adapterCore @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/singleton @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/convert @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/WordArray.ts @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/storage @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/generateRandomString.ts @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/globalHelpers @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/urlSafeDecode.ts @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/awsClients/cognitoIdentity @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/clients/internal @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/Hub @haverchuck @cshfang @jimblanc @HuiSF
-/packages/adapter-nextjs @haverchuck @cshfang @jimblanc @HuiSF
-/packages/rtn-web-browser @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/internal @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/server @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/server.ts @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/common/internalPost.ts @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/server @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/internals/server @haverchuck @cshfang @jimblanc @HuiSF
+/packages/auth @haverchuck @cshfang @HuiSF @pranavosu
+/packages/aws-amplify/src/adapter-core @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/adapterCore @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/singleton @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/utils/convert @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/utils/WordArray.ts @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/storage @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/utils/generateRandomString.ts @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/utils/globalHelpers @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/utils/urlSafeDecode.ts @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/awsClients/cognitoIdentity @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/clients/internal @haverchuck @cshfang @HuiSF @pranavosu
+/packages/core/src/Hub @haverchuck @cshfang @HuiSF @pranavosu
+/packages/adapter-nextjs @haverchuck @cshfang @HuiSF @pranavosu
+/packages/rtn-web-browser @haverchuck @cshfang @HuiSF @pranavosu
+/packages/storage/src/providers/s3/apis/internal @haverchuck @cshfang @HuiSF @pranavosu
+/packages/storage/src/providers/s3/apis/server @haverchuck @cshfang @HuiSF @pranavosu
+/packages/api-rest/src/apis/server.ts @haverchuck @cshfang @HuiSF @pranavosu
+/packages/api-rest/src/apis/common/internalPost.ts @haverchuck @cshfang @HuiSF @pranavosu
+/packages/api-graphql/src/server @haverchuck @cshfang @HuiSF @pranavosu
+/packages/api-graphql/src/internals/server @haverchuck @cshfang @HuiSF @pranavosu
diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
@@ -870,3 +870,48 @@ tests:
     spec: ssr-context-isolation
     yarn_script: ci:ssr-context-isolation
     browser: [chrome]
+  - test_name: integ_next_mfa_req_email
+    desc: 'mfa required with email sign in attribute'
+    framework: next
+    category: auth
+    sample_name: [mfa]
+    spec: mfa-req-email
+    browser: [chrome]
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: mfa-req-email
+  - test_name: integ_next_mfa_req_phone
+    desc: 'mfa required with phone sign in attribute'
+    framework: next
+    category: auth
+    sample_name: [mfa]
+    spec: mfa-req-phone
+    browser: [chrome]
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: mfa-req-phone
+  - test_name: integ_next_mfa_opt_email
+    desc: 'mfa optional with email sign in attribute'
+    framework: next
+    category: auth
+    sample_name: [mfa]
+    spec: mfa-opt-email
+    browser: [chrome]
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: mfa-opt-email
+  - test_name: integ_next_mfa_opt_phone
+    desc: 'mfa optional with phone sign in attribute'
+    framework: next
+    category: auth
+    sample_name: [mfa]
+    spec: mfa-opt-phone
+    browser: [chrome]
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: mfa-opt-phone
+  - test_name: integ_next_mfa_setup
+    desc: 'mfa setup sign in flow'
+    framework: next
+    category: auth
+    sample_name: [mfa]
+    spec: mfa-setup
+    browser: [chrome]
+    env:
+      NEXT_PUBLIC_BACKEND_CONFIG: mfa-setup
diff --git a/.github/workflows/callable-e2e-test.yml b/.github/workflows/callable-e2e-test.yml
@@ -37,6 +37,9 @@ on:
       yarn_script:
         required: false
         type: string
+      env:
+        required: false
+        type: string
 
 env:
   AMPLIFY_DIR: /home/runner/work/amplify-js/amplify-js/amplify-js
@@ -84,6 +87,7 @@ jobs:
           E2E_RETRY_COUNT: ${{ inputs.retry_count }}
           E2E_TEST_NAME: ${{ inputs.test_name }}
           E2E_YARN_SCRIPT: ${{ inputs.yarn_script }}
+          E2E_ENV: ${{ inputs.env }}
         run: |
           if [ -z "$E2E_YARN_SCRIPT" ]; then
             ../amplify-js/scripts/retry-yarn-script.sh -s \
@@ -95,7 +99,8 @@ jobs:
             $E2E_BROWSER \
             dev \
             $E2E_BACKEND \
-            $E2E_AMPLIFY_JS_DIR" \
+            $E2E_AMPLIFY_JS_DIR \
+            --env $(echo $E2E_ENV | jq -r 'tostring')" \
             $E2E_YARN_SCRIPT \
             -n $E2E_RETRY_COUNT
           else
@@ -115,6 +120,7 @@ jobs:
           E2E_RETRY_COUNT: ${{ inputs.retry_count }}
           E2E_TEST_NAME: ${{ inputs.test_name }}
           E2E_YARN_SCRIPT: ${{ inputs.yarn_script }}
+          E2E_ENV: ${{ inputs.env }}
         run: |
           if [ -z "$E2E_YARN_SCRIPT" ]; then
             ../amplify-js/scripts/retry-yarn-script.sh -s \
@@ -126,7 +132,8 @@ jobs:
             $E2E_BROWSER \
             prod \
             $E2E_BACKEND \
-            $E2E_AMPLIFY_JS_DIR" \
+            $E2E_AMPLIFY_JS_DIR \
+            --env $(echo $E2E_ENV | jq -r 'tostring')" \
             $E2E_YARN_SCRIPT \
             -n $E2E_RETRY_COUNT
           else

diff --git a/.github/workflows/callable-e2e-tests.yml b/.github/workflows/callable-e2e-tests.yml
@@ -44,6 +44,7 @@ jobs:
       timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 35 }}
       retry_count: ${{ matrix.integ-config.retry_count || 3 }}
       yarn_script: ${{ matrix.integ-config.yarn_script || '' }}
+      env: ${{ matrix.integ-config.env && toJSON(matrix.integ-config.env) || '{}' }}
 
   # e2e-test-runner-headless:
   #   name: E2E test runnner_headless

diff --git a/docs/api/assets/navigation.js b/docs/api/assets/navigation.js
diff --git a/docs/api/assets/search.js b/docs/api/assets/search.js
diff --git a/docs/api/functions/aws_amplify.api.events.closeAll.html b/docs/api/functions/aws_amplify.api.events.closeAll.html
diff --git a/docs/api/functions/aws_amplify.api.events.connect.html b/docs/api/functions/aws_amplify.api.events.connect.html
diff --git a/docs/api/functions/aws_amplify.api.events.post.html b/docs/api/functions/aws_amplify.api.events.post.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.APIEventsConfig.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.APIEventsConfig.html
diff --git a/...pi/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.EventsProviderConfig.html b/...pi/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.EventsProviderConfig.html