Skip to content

Commit c9f6884

Browse files
committed
Merge remote-tracking branch 'origin/main' into hui/fix/aws-amplify/adapter-cookie-settings
2 parents c54f2ef + 0f5f4cb commit c9f6884

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+270
-101
lines changed

.eslintrc.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,13 @@ module.exports = {
3535
'setupTests.ts',
3636
'jest.setup.*',
3737
'jest.config.*',
38-
// 'packages/adapter-nextjs/__tests__',
39-
// 'packages/analytics/__tests__',
4038
'packages/api/__tests__',
4139
'packages/api-graphql/__tests__',
42-
// 'packages/api-rest/__tests__',
43-
// 'packages/auth/__tests__',
44-
// 'packages/aws-amplify/__tests__',
45-
// 'packages/core/__tests__',
4640
'packages/datastore/__tests__',
4741
'packages/datastore-storage-adapter/__tests__',
48-
// 'packages/geo/__tests__',
4942
'packages/interactions/__tests__',
50-
// 'packages/notifications/__tests__',
5143
'packages/predictions/__tests__',
5244
'packages/pubsub/__tests__',
53-
'packages/react-native/__tests__',
54-
'packages/rtn-push-notification/__tests__',
55-
'packages/rtn-web-browser/__tests__',
56-
// 'packages/storage/__tests__',
5745
],
5846
rules: {
5947
camelcase: [

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
/packages/aws-amplify/package.json @aws-amplify/amplify-js-admins
1111
/.circleci/ @aws-amplify/amplify-js @aws-amplify/amplify-devops
1212
/.github/ @aws-amplify/amplify-js-admins
13+
14+
# The following paths involve server-side use cases, token/user session management.
15+
# Changes made to these paths requires additional reviews and approvals.
1316
/packages/auth @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
1417
/packages/aws-amplify/src/adapter-core @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
1518
/packages/core/src/adapterCore @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
@@ -23,3 +26,10 @@
2326
/packages/core/src/awsClients/cognitoIdentity @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
2427
/packages/core/src/clients/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
2528
/packages/core/src/Hub @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
29+
/packages/adapter-nextjs @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
30+
/packages/storage/src/providers/s3/apis/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
31+
/packages/storage/src/providers/s3/apis/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
32+
/packages/api-rest/src/apis/server.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
33+
/packages/api-rest/src/apis/common/internalPost.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
34+
/packages/api-graphql/src/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
35+
/packages/api-graphql/src/internals/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ the requirements below.
2424

2525
- [ ] PR description included
2626
- [ ] `yarn test` passes
27-
- [ ] Tests are [changed or added](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#steps-towards-contributions)
27+
- [ ] Unit Tests are [changed or added](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#steps-towards-contributions)
2828
- [ ] Relevant documentation is changed or added (and PR referenced)
2929

30+
31+
32+
#### Checklist for repo maintainers
33+
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
34+
35+
- [ ] Verify E2E tests for existing workflows are working as expected or add E2E tests for newly added workflows
36+
- [ ] New source file paths included in this PR have been added to CODEOWNERS, if appropriate
37+
3038
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/integ-config/detox-integ-all.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,3 @@
1616
- test_name: 'integ_rn_ios_api_v6_rn_72_detox_cli'
1717
working_directory: amplify-js-samples-staging/samples/react-native/api/v6/ApiGRAPHQL
1818
timeout_minutes: 120
19-
# - test_name: 'integ_rn_android_storage'
20-
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
21-
# - test_name: 'integ_rn_android_storage_multipart_progress'
22-
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress

.github/workflows/callable-npm-publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: |
6060
yarn run docs
6161
git add ./docs/api/
62-
git commit -m "chore(release): update API docs [skip release]"
62+
git commit -m "chore(release): Update API docs [skip release]"
6363
6464
- name: Push post release changes to the release branch
6565
working-directory: ./amplify-js

docs/api/interfaces/aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>AuthConfirmSignInInput | Amplify JS API Documentation</title><meta name="description" content="Documentation for Amplify JS API Documentation"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><link rel="stylesheet" href="../assets/custom.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script><link rel="icon" href="../favicon.ico" />
22
</head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"><a href="https://docs.amplify.aws/">Library Documentation</a><a href="https://www.npmjs.com/package/aws-amplify">NPM</a><a href="https://github.com/aws-amplify/amplify-js">GitHub</a></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">Amplify JS API Documentation</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../index.html">Amplify JS API Documentation</a></li><li><a href="../modules/aws_amplify.html">aws-amplify</a></li><li><a href="../modules/aws_amplify.auth.html">auth</a></li><li><a href="../modules/aws_amplify.auth._Reference_Types_.html">&lt;Reference Types&gt;</a></li><li><a href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html">AuthConfirmSignInInput</a></li></ul><h1>Interface AuthConfirmSignInInput&lt;ServiceOptions&gt;</h1></div><section class="tsd-panel tsd-comment"><div class="tsd-comment tsd-typography"><p>Constructs a <code>confirmSignIn</code> input.</p>
3-
</div><div class="tsd-comment tsd-typography"><h4>Param: challengeResponse</h4><p>required parameter for responding to AuthSignInStep returned during
3+
</div><div class="tsd-comment tsd-typography"><h4>Param: challengeResponse</h4><p>required parameter for responding to <code>AuthSignInStep</code> returned during
44
the sign in process.</p>
55
<h4>Param: options</h4><p>optional parameters for the Confirm Sign In process such as the service options</p>
66
</div></section><div class="tsd-signature"><span class="tsd-signature-keyword">interface </span><span class="tsd-kind-interface">AuthConfirmSignInInput</span><span class="tsd-signature-symbol">&lt;</span><a class="tsd-signature-type tsd-kind-type-parameter" href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html#ServiceOptions">ServiceOptions</a><span class="tsd-signature-symbol">&gt;</span> <span class="tsd-signature-symbol">{ </span><br/><span>    </span><a class="tsd-kind-property" href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html#challengeResponse">challengeResponse</a><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html#options">options</a><span class="tsd-signature-symbol">?: </span><a class="tsd-signature-type tsd-kind-type-parameter" href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html#ServiceOptions">ServiceOptions</a><span class="tsd-signature-symbol">; </span><br/><span class="tsd-signature-symbol">}</span></div> <section class="tsd-panel"><h4>Type Parameters</h4><ul class="tsd-type-parameter-list"><li><h4><a id="ServiceOptions" class="tsd-anchor"></a><span class="tsd-kind-type-parameter">ServiceOptions</span><span class="tsd-signature-keyword"> extends </span><a href="../types/aws_amplify.auth._Reference_Types_.AuthServiceOptions.html" class="tsd-signature-type tsd-kind-type-alias">AuthServiceOptions</a> = <a href="../types/aws_amplify.auth._Reference_Types_.AuthServiceOptions.html" class="tsd-signature-type tsd-kind-type-alias">AuthServiceOptions</a></h4></li></ul></section> <section class="tsd-panel-group tsd-index-group"><section class="tsd-panel tsd-index-panel"><details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary"><h5 class="tsd-index-heading uppercase" role="button" aria-expanded="false" tabIndex="0"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-chevronSmall"></use></svg> Index</h5></summary><div class="tsd-accordion-details"><section class="tsd-index-section"><h3 class="tsd-index-heading">Properties</h3><div class="tsd-index-list"><a href="aws_amplify.auth._Reference_Types_.AuthConfirmSignInInput.html#challengeResponse" class="tsd-index-link"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>challenge<wbr/>Response</span></a>

docs/api/modules/_aws_amplify_adapter_nextjs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>@aws-amplify/adapter-nextjs - v1.2.4 | Amplify JS API Documentation</title><meta name="description" content="Documentation for Amplify JS API Documentation"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><link rel="stylesheet" href="../assets/custom.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script><link rel="icon" href="../favicon.ico" />
2-
</head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"><a href="https://docs.amplify.aws/">Library Documentation</a><a href="https://www.npmjs.com/package/aws-amplify">NPM</a><a href="https://github.com/aws-amplify/amplify-js">GitHub</a></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">Amplify JS API Documentation</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../index.html">Amplify JS API Documentation</a></li><li><a href="_aws_amplify_adapter_nextjs.html">@aws-amplify/adapter-nextjs</a></li></ul><h1>Module @aws-amplify/adapter-nextjs - v1.2.4</h1></div><section class="tsd-panel tsd-typography"><p>This package contains the AWS Amplify Next.js Adapter. For more information on using Next.js in your application please reference the <a href="https://docs.amplify.aws/javascript/build-a-backend/server-side-rendering/nextjs/">Amplify Dev Center</a>.</p>
1+
<!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>@aws-amplify/adapter-nextjs - v1.2.6 | Amplify JS API Documentation</title><meta name="description" content="Documentation for Amplify JS API Documentation"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><link rel="stylesheet" href="../assets/custom.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script><link rel="icon" href="../favicon.ico" />
2+
</head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"><a href="https://docs.amplify.aws/">Library Documentation</a><a href="https://www.npmjs.com/package/aws-amplify">NPM</a><a href="https://github.com/aws-amplify/amplify-js">GitHub</a></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">Amplify JS API Documentation</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../index.html">Amplify JS API Documentation</a></li><li><a href="_aws_amplify_adapter_nextjs.html">@aws-amplify/adapter-nextjs</a></li></ul><h1>Module @aws-amplify/adapter-nextjs - v1.2.6</h1></div><section class="tsd-panel tsd-typography"><p>This package contains the AWS Amplify Next.js Adapter. For more information on using Next.js in your application please reference the <a href="https://docs.amplify.aws/javascript/build-a-backend/server-side-rendering/nextjs/">Amplify Dev Center</a>.</p>
33
</section><section class="tsd-panel-group tsd-index-group"><section class="tsd-panel tsd-index-panel"><h3 class="tsd-index-heading uppercase">Index</h3><section class="tsd-index-section"><h3 class="tsd-index-heading">Modules</h3><div class="tsd-index-list"><a href="_aws_amplify_adapter_nextjs.api.html" class="tsd-index-link"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-2"></use></svg><span>api</span></a>
44
<a href="_aws_amplify_adapter_nextjs.index.html" class="tsd-index-link"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-2"></use></svg><span>index</span></a>
55
<a href="_aws_amplify_adapter_nextjs.utils.html" class="tsd-index-link"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-2"></use></svg><span>utils</span></a>

0 commit comments

Comments
 (0)