@aws-amplify/adapter-nextjs 0.0.2-console-preview.f7f118b.0 → 0.0.2-console-preview.8f82e46.0
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.
- package/lib/utils/createCookieStorageAdapterFromNextServerContext.js +20 -21
- package/lib/utils/createCookieStorageAdapterFromNextServerContext.js.map +1 -1
- package/lib-esm/utils/createCookieStorageAdapterFromNextServerContext.js +20 -21
- package/lib-esm/utils/createCookieStorageAdapterFromNextServerContext.js.map +1 -1
- package/package.json +4 -4
- package/src/utils/createCookieStorageAdapterFromNextServerContext.ts +24 -23
|
@@ -60,14 +60,14 @@ var createCookieStorageAdapterFromNextRequestAndNextResponse = function (request
|
|
|
60
60
|
var mutableCookieStore = response.cookies;
|
|
61
61
|
return {
|
|
62
62
|
get: function (name) {
|
|
63
|
-
return readonlyCookieStore.get(
|
|
63
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
64
64
|
},
|
|
65
65
|
getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
|
|
66
66
|
set: function (name, value, options) {
|
|
67
|
-
mutableCookieStore.set(
|
|
67
|
+
mutableCookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
68
68
|
},
|
|
69
69
|
delete: function (name) {
|
|
70
|
-
mutableCookieStore.delete(
|
|
70
|
+
mutableCookieStore.delete(ensureEncodedForJSCookie(name));
|
|
71
71
|
},
|
|
72
72
|
};
|
|
73
73
|
};
|
|
@@ -75,7 +75,7 @@ var createCookieStorageAdapterFromNextRequestAndHttpResponse = function (request
|
|
|
75
75
|
var readonlyCookieStore = request.cookies;
|
|
76
76
|
var mutableCookieStore = createMutableCookieStoreFromHeaders(response.headers);
|
|
77
77
|
return __assign({ get: function (name) {
|
|
78
|
-
return readonlyCookieStore.get(
|
|
78
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
79
79
|
}, getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore) }, mutableCookieStore);
|
|
80
80
|
};
|
|
81
81
|
var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
@@ -87,7 +87,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
87
87
|
// and safely ignore the error if it is thrown.
|
|
88
88
|
var setFunc = function (name, value, options) {
|
|
89
89
|
try {
|
|
90
|
-
cookieStore.set(
|
|
90
|
+
cookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
91
91
|
}
|
|
92
92
|
catch (_a) {
|
|
93
93
|
// no-op
|
|
@@ -95,7 +95,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
95
95
|
};
|
|
96
96
|
var deleteFunc = function (name) {
|
|
97
97
|
try {
|
|
98
|
-
cookieStore.delete(
|
|
98
|
+
cookieStore.delete(ensureEncodedForJSCookie(name));
|
|
99
99
|
}
|
|
100
100
|
catch (_a) {
|
|
101
101
|
// no-op
|
|
@@ -103,7 +103,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
103
103
|
};
|
|
104
104
|
return {
|
|
105
105
|
get: function (name) {
|
|
106
|
-
return cookieStore.get(
|
|
106
|
+
return cookieStore.get(ensureEncodedForJSCookie(name));
|
|
107
107
|
},
|
|
108
108
|
getAll: cookieStore.getAll.bind(cookieStore),
|
|
109
109
|
set: setFunc,
|
|
@@ -121,7 +121,7 @@ var createCookieStorageAdapterFromGetServerSidePropsContext = function (request,
|
|
|
121
121
|
});
|
|
122
122
|
return {
|
|
123
123
|
get: function (name) {
|
|
124
|
-
var value = cookiesMap[
|
|
124
|
+
var value = cookiesMap[ensureEncodedForJSCookie(name)];
|
|
125
125
|
return value
|
|
126
126
|
? {
|
|
127
127
|
name: name,
|
|
@@ -133,19 +133,19 @@ var createCookieStorageAdapterFromGetServerSidePropsContext = function (request,
|
|
|
133
133
|
return allCookies;
|
|
134
134
|
},
|
|
135
135
|
set: function (name, value, options) {
|
|
136
|
-
response.setHeader('Set-Cookie', "".concat(
|
|
136
|
+
response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
|
|
137
137
|
},
|
|
138
138
|
delete: function (name) {
|
|
139
|
-
response.setHeader('Set-Cookie', "".concat(
|
|
139
|
+
response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(exports.DATE_IN_THE_PAST.toUTCString()));
|
|
140
140
|
},
|
|
141
141
|
};
|
|
142
142
|
};
|
|
143
143
|
var createMutableCookieStoreFromHeaders = function (headers) {
|
|
144
144
|
var setFunc = function (name, value, options) {
|
|
145
|
-
headers.append('Set-Cookie', "".concat(
|
|
145
|
+
headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
|
|
146
146
|
};
|
|
147
147
|
var deleteFunc = function (name) {
|
|
148
|
-
headers.append('Set-Cookie', "".concat(
|
|
148
|
+
headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(exports.DATE_IN_THE_PAST.toUTCString()));
|
|
149
149
|
};
|
|
150
150
|
return {
|
|
151
151
|
set: setFunc,
|
|
@@ -172,14 +172,13 @@ var serializeSetCookieOptions = function (options) {
|
|
|
172
172
|
}
|
|
173
173
|
return serializedOptions.join(';');
|
|
174
174
|
};
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
return name;
|
|
175
|
+
// Ensures the cookie names are encoded in order to look up the cookie store
|
|
176
|
+
// that is manipulated by js-cookie on the client side.
|
|
177
|
+
// Details of the js-cookie encoding behavior see:
|
|
178
|
+
// https://github.com/js-cookie/js-cookie#encoding
|
|
179
|
+
// The implementation is borrowed from js-cookie without escaping `[()]` as
|
|
180
|
+
// we are not using those chars in the auth keys.
|
|
181
|
+
var ensureEncodedForJSCookie = function (name) {
|
|
182
|
+
return encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent);
|
|
184
183
|
};
|
|
185
184
|
//# sourceMappingURL=createCookieStorageAdapterFromNextServerContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;AAEtC,sCAAwD;AAExD,yEAGkD;AAErC,QAAA,gBAAgB,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;AAErC,IAAM,+CAA+C,GAAG,UAC9D,OAA2B;IAErB,IAAA,KACL,OAAwD,EADxC,GAAG,aAAA,EAAY,GAAG,cACsB,CAAC;IAE1D,iFAAiF;IACjF,sEAAsE;IACtE,2EAA2E;IAC3E,6EAA6E;IAC7E,kBAAkB;IAClB,IACC,GAAG;QACH,GAAG;QACH,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,iBAAiB;QACjE,OAAO,GAAG,CAAC,SAAS,KAAK,UAAU,EAClC;QACD,OAAO,uDAAuD,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KACzE;IAEK,IAAA,KAAwB,OAG7B,EAHO,OAAO,aAAA,EAAE,QAAQ,cAGxB,CAAC;IAEF,6EAA6E;IAC7E,oBAAoB;IACpB,+EAA+E;IAC/E,qBAAqB;IACrB,2EAA2E;IAC3E,6DAA6D;IAC7D,IAAI,OAAO,IAAI,QAAQ,EAAE;QACxB,IAAI,QAAQ,YAAY,qBAAY,EAAE;YACrC,OAAO,wDAAwD,CAC9D,OAAO,EACP,QAAQ,CACR,CAAC;SACF;aAAM;YACN,OAAO,wDAAwD,CAC9D,OAAO,EACP,QAAQ,CACR,CAAC;SACF;KACD;IAEO,IAAA,OAAO,GAAK,OAEnB,QAFc,CAEb;IAEF,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,OAAO,yCAAyC,CAAC,OAAO,CAAC,CAAC;KAC1D;IAED,mCAAmC;IACnC,MAAM,IAAI,wCAAyB,CAAC;QACnC,OAAO,EACN,wFAAwF;KACzF,CAAC,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,+CAA+C,mDA0D1D;AAEF,IAAM,wDAAwD,GAAG,UAChE,OAAoB,EACpB,QAAsB;IAEtB,IAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAC5C,IAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC;IAE5C,OAAO;QACN,GAAG,YAAC,IAAI;YACP,OAAO,mBAAmB,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,14 +56,14 @@ var createCookieStorageAdapterFromNextRequestAndNextResponse = function (request
|
|
|
56
56
|
var mutableCookieStore = response.cookies;
|
|
57
57
|
return {
|
|
58
58
|
get: function (name) {
|
|
59
|
-
return readonlyCookieStore.get(
|
|
59
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
60
60
|
},
|
|
61
61
|
getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
|
|
62
62
|
set: function (name, value, options) {
|
|
63
|
-
mutableCookieStore.set(
|
|
63
|
+
mutableCookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
64
64
|
},
|
|
65
65
|
delete: function (name) {
|
|
66
|
-
mutableCookieStore.delete(
|
|
66
|
+
mutableCookieStore.delete(ensureEncodedForJSCookie(name));
|
|
67
67
|
},
|
|
68
68
|
};
|
|
69
69
|
};
|
|
@@ -71,7 +71,7 @@ var createCookieStorageAdapterFromNextRequestAndHttpResponse = function (request
|
|
|
71
71
|
var readonlyCookieStore = request.cookies;
|
|
72
72
|
var mutableCookieStore = createMutableCookieStoreFromHeaders(response.headers);
|
|
73
73
|
return __assign({ get: function (name) {
|
|
74
|
-
return readonlyCookieStore.get(
|
|
74
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
75
75
|
}, getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore) }, mutableCookieStore);
|
|
76
76
|
};
|
|
77
77
|
var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
@@ -83,7 +83,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
83
83
|
// and safely ignore the error if it is thrown.
|
|
84
84
|
var setFunc = function (name, value, options) {
|
|
85
85
|
try {
|
|
86
|
-
cookieStore.set(
|
|
86
|
+
cookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
87
87
|
}
|
|
88
88
|
catch (_a) {
|
|
89
89
|
// no-op
|
|
@@ -91,7 +91,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
91
91
|
};
|
|
92
92
|
var deleteFunc = function (name) {
|
|
93
93
|
try {
|
|
94
|
-
cookieStore.delete(
|
|
94
|
+
cookieStore.delete(ensureEncodedForJSCookie(name));
|
|
95
95
|
}
|
|
96
96
|
catch (_a) {
|
|
97
97
|
// no-op
|
|
@@ -99,7 +99,7 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
|
|
|
99
99
|
};
|
|
100
100
|
return {
|
|
101
101
|
get: function (name) {
|
|
102
|
-
return cookieStore.get(
|
|
102
|
+
return cookieStore.get(ensureEncodedForJSCookie(name));
|
|
103
103
|
},
|
|
104
104
|
getAll: cookieStore.getAll.bind(cookieStore),
|
|
105
105
|
set: setFunc,
|
|
@@ -117,7 +117,7 @@ var createCookieStorageAdapterFromGetServerSidePropsContext = function (request,
|
|
|
117
117
|
});
|
|
118
118
|
return {
|
|
119
119
|
get: function (name) {
|
|
120
|
-
var value = cookiesMap[
|
|
120
|
+
var value = cookiesMap[ensureEncodedForJSCookie(name)];
|
|
121
121
|
return value
|
|
122
122
|
? {
|
|
123
123
|
name: name,
|
|
@@ -129,19 +129,19 @@ var createCookieStorageAdapterFromGetServerSidePropsContext = function (request,
|
|
|
129
129
|
return allCookies;
|
|
130
130
|
},
|
|
131
131
|
set: function (name, value, options) {
|
|
132
|
-
response.setHeader('Set-Cookie', "".concat(
|
|
132
|
+
response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
|
|
133
133
|
},
|
|
134
134
|
delete: function (name) {
|
|
135
|
-
response.setHeader('Set-Cookie', "".concat(
|
|
135
|
+
response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(DATE_IN_THE_PAST.toUTCString()));
|
|
136
136
|
},
|
|
137
137
|
};
|
|
138
138
|
};
|
|
139
139
|
var createMutableCookieStoreFromHeaders = function (headers) {
|
|
140
140
|
var setFunc = function (name, value, options) {
|
|
141
|
-
headers.append('Set-Cookie', "".concat(
|
|
141
|
+
headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
|
|
142
142
|
};
|
|
143
143
|
var deleteFunc = function (name) {
|
|
144
|
-
headers.append('Set-Cookie', "".concat(
|
|
144
|
+
headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(DATE_IN_THE_PAST.toUTCString()));
|
|
145
145
|
};
|
|
146
146
|
return {
|
|
147
147
|
set: setFunc,
|
|
@@ -168,14 +168,13 @@ var serializeSetCookieOptions = function (options) {
|
|
|
168
168
|
}
|
|
169
169
|
return serializedOptions.join(';');
|
|
170
170
|
};
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
return name;
|
|
171
|
+
// Ensures the cookie names are encoded in order to look up the cookie store
|
|
172
|
+
// that is manipulated by js-cookie on the client side.
|
|
173
|
+
// Details of the js-cookie encoding behavior see:
|
|
174
|
+
// https://github.com/js-cookie/js-cookie#encoding
|
|
175
|
+
// The implementation is borrowed from js-cookie without escaping `[()]` as
|
|
176
|
+
// we are not using those chars in the auth keys.
|
|
177
|
+
var ensureEncodedForJSCookie = function (name) {
|
|
178
|
+
return encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent);
|
|
180
179
|
};
|
|
181
180
|
//# sourceMappingURL=createCookieStorageAdapterFromNextServerContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;AAEtC,OAAO,EAAe,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EACN,yBAAyB,GAEzB,MAAM,0CAA0C,CAAC;AAElD,MAAM,CAAC,IAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;AAE5C,MAAM,CAAC,IAAM,+CAA+C,GAAG,UAC9D,OAA2B;IAErB,IAAA,KACL,OAAwD,EADxC,GAAG,aAAA,EAAY,GAAG,cACsB,CAAC;IAE1D,iFAAiF;IACjF,sEAAsE;IACtE,2EAA2E;IAC3E,6EAA6E;IAC7E,kBAAkB;IAClB,IACC,GAAG;QACH,GAAG;QACH,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,iBAAiB;QACjE,OAAO,GAAG,CAAC,SAAS,KAAK,UAAU,EAClC;QACD,OAAO,uDAAuD,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KACzE;IAEK,IAAA,KAAwB,OAG7B,EAHO,OAAO,aAAA,EAAE,QAAQ,cAGxB,CAAC;IAEF,6EAA6E;IAC7E,oBAAoB;IACpB,+EAA+E;IAC/E,qBAAqB;IACrB,2EAA2E;IAC3E,6DAA6D;IAC7D,IAAI,OAAO,IAAI,QAAQ,EAAE;QACxB,IAAI,QAAQ,YAAY,YAAY,EAAE;YACrC,OAAO,wDAAwD,CAC9D,OAAO,EACP,QAAQ,CACR,CAAC;SACF;aAAM;YACN,OAAO,wDAAwD,CAC9D,OAAO,EACP,QAAQ,CACR,CAAC;SACF;KACD;IAEO,IAAA,OAAO,GAAK,OAEnB,QAFc,CAEb;IAEF,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QAClC,OAAO,yCAAyC,CAAC,OAAO,CAAC,CAAC;KAC1D;IAED,mCAAmC;IACnC,MAAM,IAAI,yBAAyB,CAAC;QACnC,OAAO,EACN,wFAAwF;KACzF,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,IAAM,wDAAwD,GAAG,UAChE,OAAoB,EACpB,QAAsB;IAEtB,IAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAC5C,IAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC;IAE5C,OAAO;QACN,GAAG,YAAC,IAAI;YACP,OAAO,mBAAmB,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"name": "@aws-amplify/adapter-nextjs",
|
|
4
4
|
"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
|
|
5
5
|
"peerDependencies": {
|
|
6
|
-
"aws-amplify": "6.0.1-console-preview.
|
|
6
|
+
"aws-amplify": "6.0.1-console-preview.8f82e46.0+8f82e46",
|
|
7
7
|
"next": ">=13.4.0 <14.0.0"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"@types/node": "^20.3.1",
|
|
16
16
|
"@types/react": "^18.2.13",
|
|
17
17
|
"@types/react-dom": "^18.2.6",
|
|
18
|
-
"aws-amplify": "6.0.1-console-preview.
|
|
18
|
+
"aws-amplify": "6.0.1-console-preview.8f82e46.0+8f82e46",
|
|
19
19
|
"jest-fetch-mock": "3.0.3",
|
|
20
20
|
"next": ">= 13.4.0 < 14.0.0",
|
|
21
21
|
"typescript": "5.1.6"
|
|
@@ -107,6 +107,6 @@
|
|
|
107
107
|
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
|
|
108
108
|
},
|
|
109
109
|
"typings": "./lib-esm/index.d.ts",
|
|
110
|
-
"version": "0.0.2-console-preview.
|
|
111
|
-
"gitHead": "
|
|
110
|
+
"version": "0.0.2-console-preview.8f82e46.0+8f82e46",
|
|
111
|
+
"gitHead": "8f82e460c4cdb9e52e0ba7ed8aea90f627a27693"
|
|
112
112
|
}
|
|
@@ -79,14 +79,14 @@ const createCookieStorageAdapterFromNextRequestAndNextResponse = (
|
|
|
79
79
|
|
|
80
80
|
return {
|
|
81
81
|
get(name) {
|
|
82
|
-
return readonlyCookieStore.get(
|
|
82
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
83
83
|
},
|
|
84
84
|
getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
|
|
85
85
|
set(name, value, options) {
|
|
86
|
-
mutableCookieStore.set(
|
|
86
|
+
mutableCookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
87
87
|
},
|
|
88
88
|
delete(name) {
|
|
89
|
-
mutableCookieStore.delete(
|
|
89
|
+
mutableCookieStore.delete(ensureEncodedForJSCookie(name));
|
|
90
90
|
},
|
|
91
91
|
};
|
|
92
92
|
};
|
|
@@ -102,7 +102,7 @@ const createCookieStorageAdapterFromNextRequestAndHttpResponse = (
|
|
|
102
102
|
|
|
103
103
|
return {
|
|
104
104
|
get(name) {
|
|
105
|
-
return readonlyCookieStore.get(
|
|
105
|
+
return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
|
|
106
106
|
},
|
|
107
107
|
getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
|
|
108
108
|
...mutableCookieStore,
|
|
@@ -121,7 +121,7 @@ const createCookieStorageAdapterFromNextCookies = (
|
|
|
121
121
|
// and safely ignore the error if it is thrown.
|
|
122
122
|
const setFunc: CookieStorage.Adapter['set'] = (name, value, options) => {
|
|
123
123
|
try {
|
|
124
|
-
cookieStore.set(
|
|
124
|
+
cookieStore.set(ensureEncodedForJSCookie(name), value, options);
|
|
125
125
|
} catch {
|
|
126
126
|
// no-op
|
|
127
127
|
}
|
|
@@ -129,7 +129,7 @@ const createCookieStorageAdapterFromNextCookies = (
|
|
|
129
129
|
|
|
130
130
|
const deleteFunc: CookieStorage.Adapter['delete'] = name => {
|
|
131
131
|
try {
|
|
132
|
-
cookieStore.delete(
|
|
132
|
+
cookieStore.delete(ensureEncodedForJSCookie(name));
|
|
133
133
|
} catch {
|
|
134
134
|
// no-op
|
|
135
135
|
}
|
|
@@ -137,7 +137,7 @@ const createCookieStorageAdapterFromNextCookies = (
|
|
|
137
137
|
|
|
138
138
|
return {
|
|
139
139
|
get(name) {
|
|
140
|
-
return cookieStore.get(
|
|
140
|
+
return cookieStore.get(ensureEncodedForJSCookie(name));
|
|
141
141
|
},
|
|
142
142
|
getAll: cookieStore.getAll.bind(cookieStore),
|
|
143
143
|
set: setFunc,
|
|
@@ -157,7 +157,7 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
|
|
|
157
157
|
|
|
158
158
|
return {
|
|
159
159
|
get(name) {
|
|
160
|
-
const value = cookiesMap[
|
|
160
|
+
const value = cookiesMap[ensureEncodedForJSCookie(name)];
|
|
161
161
|
return value
|
|
162
162
|
? {
|
|
163
163
|
name,
|
|
@@ -171,7 +171,7 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
|
|
|
171
171
|
set(name, value, options) {
|
|
172
172
|
response.setHeader(
|
|
173
173
|
'Set-Cookie',
|
|
174
|
-
`${
|
|
174
|
+
`${ensureEncodedForJSCookie(name)}=${value};${
|
|
175
175
|
options ? serializeSetCookieOptions(options) : ''
|
|
176
176
|
}`
|
|
177
177
|
);
|
|
@@ -179,7 +179,9 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
|
|
|
179
179
|
delete(name) {
|
|
180
180
|
response.setHeader(
|
|
181
181
|
'Set-Cookie',
|
|
182
|
-
`${
|
|
182
|
+
`${ensureEncodedForJSCookie(
|
|
183
|
+
name
|
|
184
|
+
)}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
|
|
183
185
|
);
|
|
184
186
|
},
|
|
185
187
|
};
|
|
@@ -191,7 +193,7 @@ const createMutableCookieStoreFromHeaders = (
|
|
|
191
193
|
const setFunc: CookieStorage.Adapter['set'] = (name, value, options) => {
|
|
192
194
|
headers.append(
|
|
193
195
|
'Set-Cookie',
|
|
194
|
-
`${
|
|
196
|
+
`${ensureEncodedForJSCookie(name)}=${value};${
|
|
195
197
|
options ? serializeSetCookieOptions(options) : ''
|
|
196
198
|
}`
|
|
197
199
|
);
|
|
@@ -199,7 +201,9 @@ const createMutableCookieStoreFromHeaders = (
|
|
|
199
201
|
const deleteFunc: CookieStorage.Adapter['delete'] = name => {
|
|
200
202
|
headers.append(
|
|
201
203
|
'Set-Cookie',
|
|
202
|
-
`${
|
|
204
|
+
`${ensureEncodedForJSCookie(
|
|
205
|
+
name
|
|
206
|
+
)}=;Expires=${DATE_IN_THE_PAST.toUTCString()}`
|
|
203
207
|
);
|
|
204
208
|
};
|
|
205
209
|
return {
|
|
@@ -231,14 +235,11 @@ const serializeSetCookieOptions = (
|
|
|
231
235
|
return serializedOptions.join(';');
|
|
232
236
|
};
|
|
233
237
|
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
return name;
|
|
244
|
-
};
|
|
238
|
+
// Ensures the cookie names are encoded in order to look up the cookie store
|
|
239
|
+
// that is manipulated by js-cookie on the client side.
|
|
240
|
+
// Details of the js-cookie encoding behavior see:
|
|
241
|
+
// https://github.com/js-cookie/js-cookie#encoding
|
|
242
|
+
// The implementation is borrowed from js-cookie without escaping `[()]` as
|
|
243
|
+
// we are not using those chars in the auth keys.
|
|
244
|
+
const ensureEncodedForJSCookie = (name: string): string =>
|
|
245
|
+
encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent);
|