@aws-amplify/adapter-nextjs 1.7.3-unstable.3246992.0 → 1.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/cjs/auth/utils/getCookieValuesFromRequest.js +6 -1
  2. package/dist/cjs/auth/utils/getCookieValuesFromRequest.js.map +1 -1
  3. package/dist/esm/auth/utils/authFlowProofCookies.mjs +1 -1
  4. package/dist/esm/auth/utils/getCookieValuesFromRequest.mjs +7 -1
  5. package/dist/esm/auth/utils/getCookieValuesFromRequest.mjs.map +1 -1
  6. package/package.json +69 -70
  7. package/src/auth/utils/getCookieValuesFromRequest.ts +7 -1
package/dist/cjs/auth/utils/getCookieValuesFromRequest.js CHANGED
@@ -4,6 +4,7 @@
4
4
  // SPDX-License-Identifier: Apache-2.0
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getCookieValuesFromRequest = void 0;
7
+ const ensureEncodedForJSCookie_1 = require("../../utils/cookie/ensureEncodedForJSCookie");
7
8
  const getCookieValuesFromRequest = (request, cookieNames) => {
8
9
  const cookieHeader = request.headers.get('Cookie');
9
10
  if (!cookieHeader) {
@@ -16,9 +17,13 @@ const getCookieValuesFromRequest = (request, cookieNames) => {
16
17
  result[key] = value;
17
18
  return result;
18
19
  }, {});
20
+ // Cookie names are written via `ensureEncodedForJSCookie`, so they appear
21
+ // percent-encoded on the wire when they contain unsafe characters (e.g. `@`
22
+ // in email-based Cognito usernames). Match the lookup keys using the same
23
+ // encoding so reads align with writes.
19
24
  const result = {};
20
25
  for (const cookieName of cookieNames) {
21
- result[cookieName] = cookieValues[cookieName];
26
+ result[cookieName] = cookieValues[(0, ensureEncodedForJSCookie_1.ensureEncodedForJSCookie)(cookieName)];
22
27
  }
23
28
  return result;
24
29
  };
package/dist/cjs/auth/utils/getCookieValuesFromRequest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCookieValuesFromRequest.js","sources":["../../../../src/auth/utils/getCookieValuesFromRequest.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.getCookieValuesFromRequest = void 0;\nconst getCookieValuesFromRequest = (request, cookieNames) => {\n const cookieHeader = request.headers.get('Cookie');\n if (!cookieHeader) {\n return {};\n }\n const cookieValues = cookieHeader\n .split(';')\n .map(cookie => cookie.trim().split('='))\n .reduce((result, [key, value]) => {\n result[key] = value;\n return result;\n }, {});\n const result = {};\n for (const cookieName of cookieNames) {\n result[cookieName] = cookieValues[cookieName];\n }\n return result;\n};\nexports.getCookieValuesFromRequest = getCookieValuesFromRequest;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC7D,OAAO,CAAC,0BAA0B,GAAG,MAAM;AAC3C,MAAM,0BAA0B,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK;AAC7D,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,IAAI,CAAC,YAAY,EAAE;AACvB,QAAQ,OAAO,EAAE;AACjB,IAAI;AACJ,IAAI,MAAM,YAAY,GAAG;AACzB,SAAS,KAAK,CAAC,GAAG;AAClB,SAAS,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;AAC/C,SAAS,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK;AAC1C,QAAQ,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;AAC3B,QAAQ,OAAO,MAAM;AACrB,IAAI,CAAC,EAAE,EAAE,CAAC;AACV,IAAI,MAAM,MAAM,GAAG,EAAE;AACrB,IAAI,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;AAC1C,QAAQ,MAAM,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;AACrD,IAAI;AACJ,IAAI,OAAO,MAAM;AACjB,CAAC;AACD,OAAO,CAAC,0BAA0B,GAAG,0BAA0B;;"}
1
+ {"version":3,"file":"getCookieValuesFromRequest.js","sources":["../../../../src/auth/utils/getCookieValuesFromRequest.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.getCookieValuesFromRequest = void 0;\nconst ensureEncodedForJSCookie_1 = require(\"../../utils/cookie/ensureEncodedForJSCookie\");\nconst getCookieValuesFromRequest = (request, cookieNames) => {\n const cookieHeader = request.headers.get('Cookie');\n if (!cookieHeader) {\n return {};\n }\n const cookieValues = cookieHeader\n .split(';')\n .map(cookie => cookie.trim().split('='))\n .reduce((result, [key, value]) => {\n result[key] = value;\n return result;\n }, {});\n // Cookie names are written via `ensureEncodedForJSCookie`, so they appear\n // percent-encoded on the wire when they contain unsafe characters (e.g. `@`\n // in email-based Cognito usernames). Match the lookup keys using the same\n // encoding so reads align with writes.\n const result = {};\n for (const cookieName of cookieNames) {\n result[cookieName] = cookieValues[(0, ensureEncodedForJSCookie_1.ensureEncodedForJSCookie)(cookieName)];\n }\n return result;\n};\nexports.getCookieValuesFromRequest = getCookieValuesFromRequest;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC7D,OAAO,CAAC,0BAA0B,GAAG,MAAM;AAC3C,MAAM,0BAA0B,GAAG,OAAO,CAAC,6CAA6C,CAAC;AACzF,MAAM,0BAA0B,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK;AAC7D,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,IAAI,CAAC,YAAY,EAAE;AACvB,QAAQ,OAAO,EAAE;AACjB,IAAI;AACJ,IAAI,MAAM,YAAY,GAAG;AACzB,SAAS,KAAK,CAAC,GAAG;AAClB,SAAS,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;AAC/C,SAAS,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK;AAC1C,QAAQ,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;AAC3B,QAAQ,OAAO,MAAM;AACrB,IAAI,CAAC,EAAE,EAAE,CAAC;AACV;AACA;AACA;AACA;AACA,IAAI,MAAM,MAAM,GAAG,EAAE;AACrB,IAAI,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;AAC1C,QAAQ,MAAM,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,IAAI,0BAA0B,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC/G,IAAI;AACJ,IAAI,OAAO,MAAM;AACjB,CAAC;AACD,OAAO,CAAC,0BAA0B,GAAG,0BAA0B;;"}
package/dist/esm/auth/utils/authFlowProofCookies.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { PKCE_COOKIE_NAME, STATE_COOKIE_NAME, IS_SIGNING_OUT_COOKIE_NAME, IS_SIGNING_OUT_REDIRECTING_COOKIE_NAME, AUTH_FLOW_PROOF_MAX_AGE, REMOVE_COOKIE_MAX_AGE } from '../constant.mjs';
1
+ import { REMOVE_COOKIE_MAX_AGE, AUTH_FLOW_PROOF_MAX_AGE, PKCE_COOKIE_NAME, STATE_COOKIE_NAME, IS_SIGNING_OUT_COOKIE_NAME, IS_SIGNING_OUT_REDIRECTING_COOKIE_NAME } from '../constant.mjs';
2
2
  import { isSSLOrigin } from './origin.mjs';
3
3
 
4
4
  // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
package/dist/esm/auth/utils/getCookieValuesFromRequest.mjs CHANGED
@@ -1,3 +1,5 @@
1
+ import { ensureEncodedForJSCookie } from '../../utils/cookie/ensureEncodedForJSCookie.mjs';
2
+
1
3
  // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
4
  // SPDX-License-Identifier: Apache-2.0
3
5
  const getCookieValuesFromRequest = (request, cookieNames) => {
@@ -12,9 +14,13 @@ const getCookieValuesFromRequest = (request, cookieNames) => {
12
14
  result[key] = value;
13
15
  return result;
14
16
  }, {});
17
+ // Cookie names are written via `ensureEncodedForJSCookie`, so they appear
18
+ // percent-encoded on the wire when they contain unsafe characters (e.g. `@`
19
+ // in email-based Cognito usernames). Match the lookup keys using the same
20
+ // encoding so reads align with writes.
15
21
  const result = {};
16
22
  for (const cookieName of cookieNames) {
17
- result[cookieName] = cookieValues[cookieName];
23
+ result[cookieName] = cookieValues[ensureEncodedForJSCookie(cookieName)];
18
24
  }
19
25
  return result;
20
26
  };
package/dist/esm/auth/utils/getCookieValuesFromRequest.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCookieValuesFromRequest.mjs","sources":["../../../../src/auth/utils/getCookieValuesFromRequest.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport const getCookieValuesFromRequest = (request, cookieNames) => {\n const cookieHeader = request.headers.get('Cookie');\n if (!cookieHeader) {\n return {};\n }\n const cookieValues = cookieHeader\n .split(';')\n .map(cookie => cookie.trim().split('='))\n .reduce((result, [key, value]) => {\n result[key] = value;\n return result;\n }, {});\n const result = {};\n for (const cookieName of cookieNames) {\n result[cookieName] = cookieValues[cookieName];\n }\n return result;\n};\n"],"names":[],"mappings":"AAAA;AACA;AACY,MAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK;AACpE,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,IAAI,CAAC,YAAY,EAAE;AACvB,QAAQ,OAAO,EAAE;AACjB,IAAI;AACJ,IAAI,MAAM,YAAY,GAAG;AACzB,SAAS,KAAK,CAAC,GAAG;AAClB,SAAS,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;AAC/C,SAAS,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK;AAC1C,QAAQ,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;AAC3B,QAAQ,OAAO,MAAM;AACrB,IAAI,CAAC,EAAE,EAAE,CAAC;AACV,IAAI,MAAM,MAAM,GAAG,EAAE;AACrB,IAAI,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;AAC1C,QAAQ,MAAM,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC;AACrD,IAAI;AACJ,IAAI,OAAO,MAAM;AACjB;;;;"}
1
+ {"version":3,"file":"getCookieValuesFromRequest.mjs","sources":["../../../../src/auth/utils/getCookieValuesFromRequest.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { ensureEncodedForJSCookie } from '../../utils/cookie/ensureEncodedForJSCookie';\nexport const getCookieValuesFromRequest = (request, cookieNames) => {\n const cookieHeader = request.headers.get('Cookie');\n if (!cookieHeader) {\n return {};\n }\n const cookieValues = cookieHeader\n .split(';')\n .map(cookie => cookie.trim().split('='))\n .reduce((result, [key, value]) => {\n result[key] = value;\n return result;\n }, {});\n // Cookie names are written via `ensureEncodedForJSCookie`, so they appear\n // percent-encoded on the wire when they contain unsafe characters (e.g. `@`\n // in email-based Cognito usernames). Match the lookup keys using the same\n // encoding so reads align with writes.\n const result = {};\n for (const cookieName of cookieNames) {\n result[cookieName] = cookieValues[ensureEncodedForJSCookie(cookieName)];\n }\n return result;\n};\n"],"names":[],"mappings":";;AAAA;AACA;AAEY,MAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK;AACpE,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,IAAI,CAAC,YAAY,EAAE;AACvB,QAAQ,OAAO,EAAE;AACjB,IAAI;AACJ,IAAI,MAAM,YAAY,GAAG;AACzB,SAAS,KAAK,CAAC,GAAG;AAClB,SAAS,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;AAC/C,SAAS,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK;AAC1C,QAAQ,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;AAC3B,QAAQ,OAAO,MAAM;AACrB,IAAI,CAAC,EAAE,EAAE,CAAC;AACV;AACA;AACA;AACA;AACA,IAAI,MAAM,MAAM,GAAG,EAAE;AACrB,IAAI,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;AAC1C,QAAQ,MAAM,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;AAC/E,IAAI;AACJ,IAAI,OAAO,MAAM;AACjB;;;;"}
package/package.json CHANGED
@@ -1,72 +1,71 @@
1
1
  {
2
- "author": "Amazon Web Services",
3
- "name": "@aws-amplify/adapter-nextjs",
4
- "version": "1.7.3-unstable.3246992.0+3246992",
5
- "description": "The adapter for the supporting of using Amplify APIs in Next.js.",
6
- "peerDependencies": {
7
- "aws-amplify": "6.16.3-unstable.3246992.0+3246992",
8
- "next": ">=13.5.0 <17.0.0"
9
- },
10
- "dependencies": {
11
- "aws-jwt-verify": "^4.0.1"
12
- },
13
- "devDependencies": {
14
- "@types/node": "^20.3.1",
15
- "@types/react": "^18.2.13",
16
- "@types/react-dom": "^18.2.6",
17
- "aws-amplify": "6.16.3-unstable.3246992.0+3246992",
18
- "jest-fetch-mock": "3.0.3",
19
- "next": ">= 13.5.0 <17.0.0"
20
- },
21
- "publishConfig": {
22
- "access": "public"
23
- },
24
- "bugs": {
25
- "url": "https://github.com/aws/aws-amplify/issues"
26
- },
27
- "exports": {
28
- ".": {
29
- "types": "./dist/esm/index.d.ts",
30
- "import": "./dist/esm/index.mjs",
31
- "require": "./dist/cjs/index.js"
32
- },
33
- "./api": {
34
- "types": "./dist/esm/api/index.d.ts",
35
- "import": "./dist/esm/api/index.mjs",
36
- "require": "./dist/cjs/api/index.js"
37
- },
38
- "./data": {
39
- "types": "./dist/esm/api/index.d.ts",
40
- "import": "./dist/esm/api/index.mjs",
41
- "require": "./dist/cjs/api/index.js"
42
- },
43
- "./package.json": "./package.json"
44
- },
45
- "files": [
46
- "dist/cjs",
47
- "dist/esm",
48
- "src",
49
- "api",
50
- "data"
51
- ],
52
- "homepage": "https://aws-amplify.github.io/",
53
- "license": "Apache-2.0",
54
- "main": "./dist/cjs/index.js",
55
- "module": "./dist/esm/index.mjs",
56
- "typings": "./dist/esm/index.d.ts",
57
- "sideEffects": false,
58
- "scripts": {
59
- "build": "npm run clean && npm run build:esm-cjs",
60
- "build-with-test": "npm test && npm run build",
61
- "build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
62
- "build:watch": "npm run build:esm-cjs -- --watch",
63
- "clean": "npm run clean:size && rimraf dist",
64
- "clean:size": "rimraf dual-publish-tmp tmp*",
65
- "format": "echo \"Not implemented\"",
66
- "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
67
- "lint:fix": "eslint '**/*.{ts,tsx}' --fix",
68
- "test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
69
- "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
70
- },
71
- "gitHead": "324699261cfef10c9783db6533c3e446ad99e510"
2
+ "author": "Amazon Web Services",
3
+ "name": "@aws-amplify/adapter-nextjs",
4
+ "version": "1.7.3",
5
+ "description": "The adapter for the supporting of using Amplify APIs in Next.js.",
6
+ "peerDependencies": {
7
+ "aws-amplify": "^6.16.4",
8
+ "next": ">=13.5.0 <17.0.0"
9
+ },
10
+ "dependencies": {
11
+ "aws-jwt-verify": "^4.0.1"
12
+ },
13
+ "devDependencies": {
14
+ "@types/node": "^20.3.1",
15
+ "@types/react": "^18.2.13",
16
+ "@types/react-dom": "^18.2.6",
17
+ "aws-amplify": "6.17.0",
18
+ "jest-fetch-mock": "3.0.3",
19
+ "next": ">= 13.5.0 <17.0.0"
20
+ },
21
+ "publishConfig": {
22
+ "access": "public"
23
+ },
24
+ "bugs": {
25
+ "url": "https://github.com/aws/aws-amplify/issues"
26
+ },
27
+ "exports": {
28
+ ".": {
29
+ "types": "./dist/esm/index.d.ts",
30
+ "import": "./dist/esm/index.mjs",
31
+ "require": "./dist/cjs/index.js"
32
+ },
33
+ "./api": {
34
+ "types": "./dist/esm/api/index.d.ts",
35
+ "import": "./dist/esm/api/index.mjs",
36
+ "require": "./dist/cjs/api/index.js"
37
+ },
38
+ "./data": {
39
+ "types": "./dist/esm/api/index.d.ts",
40
+ "import": "./dist/esm/api/index.mjs",
41
+ "require": "./dist/cjs/api/index.js"
42
+ },
43
+ "./package.json": "./package.json"
44
+ },
45
+ "files": [
46
+ "dist/cjs",
47
+ "dist/esm",
48
+ "src",
49
+ "api",
50
+ "data"
51
+ ],
52
+ "homepage": "https://aws-amplify.github.io/",
53
+ "license": "Apache-2.0",
54
+ "main": "./dist/cjs/index.js",
55
+ "module": "./dist/esm/index.mjs",
56
+ "typings": "./dist/esm/index.d.ts",
57
+ "sideEffects": false,
58
+ "scripts": {
59
+ "build": "npm run clean && npm run build:esm-cjs",
60
+ "build-with-test": "npm test && npm run build",
61
+ "build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
62
+ "build:watch": "npm run build:esm-cjs -- --watch",
63
+ "clean": "npm run clean:size && rimraf dist",
64
+ "clean:size": "rimraf dual-publish-tmp tmp*",
65
+ "format": "echo \"Not implemented\"",
66
+ "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
67
+ "lint:fix": "eslint '**/*.{ts,tsx}' --fix",
68
+ "test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
69
+ "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
70
+ }
72
71
  }
package/src/auth/utils/getCookieValuesFromRequest.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  // SPDX-License-Identifier: Apache-2.0
3
3
 
4
+ import { ensureEncodedForJSCookie } from '../../utils/cookie/ensureEncodedForJSCookie';
5
+
4
6
  export const getCookieValuesFromRequest = <CookieNames extends string[]>(
5
7
  request: Request,
6
8
  cookieNames: CookieNames,
@@ -20,9 +22,13 @@ export const getCookieValuesFromRequest = <CookieNames extends string[]>(
20
22
  return result;
21
23
  }, {});
22
24
 
25
+ // Cookie names are written via `ensureEncodedForJSCookie`, so they appear
26
+ // percent-encoded on the wire when they contain unsafe characters (e.g. `@`
27
+ // in email-based Cognito usernames). Match the lookup keys using the same
28
+ // encoding so reads align with writes.
23
29
  const result: Record<string, string | undefined> = {};
24
30
  for (const cookieName of cookieNames) {
25
- result[cookieName] = cookieValues[cookieName];
31
+ result[cookieName] = cookieValues[ensureEncodedForJSCookie(cookieName)];
26
32
  }
27
33
 
28
34
  return result as Partial<Record<CookieNames[number], string | undefined>>;