next-ssr-middleware 0.9.1 → 0.9.2
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.
|
@@ -11,7 +11,7 @@ function oauth2Signer(_a) {
|
|
|
11
11
|
var signInURL = _a.signInURL, accessToken = _a.accessToken, userProfile = _a.userProfile, _b = _a.tokenKey, tokenKey = _b === void 0 ? 'token' : _b;
|
|
12
12
|
return function (_a, next_1) { return tslib_1.__awaiter(_this, [_a, next_1], void 0, function (_b, next) {
|
|
13
13
|
var token, pageURL, token_1, searchParams, user, data, props;
|
|
14
|
-
var _c = _b.req, url = _c.url, headers = _c.headers, cookies = _c.cookies, query = _b.query;
|
|
14
|
+
var _c = _b.req, url = _c.url, headers = _c.headers, cookies = _c.cookies, query = _b.query, res = _b.res;
|
|
15
15
|
return tslib_1.__generator(this, function (_d) {
|
|
16
16
|
switch (_d.label) {
|
|
17
17
|
case 0:
|
|
@@ -21,7 +21,12 @@ function oauth2Signer(_a) {
|
|
|
21
21
|
return [4 /*yield*/, accessToken(query)];
|
|
22
22
|
case 1:
|
|
23
23
|
token_1 = _d.sent(), searchParams = pageURL.searchParams;
|
|
24
|
-
|
|
24
|
+
try {
|
|
25
|
+
res.setHeader('Set-Cookie', "".concat(tokenKey, "=").concat(token_1, "; Path=/"));
|
|
26
|
+
}
|
|
27
|
+
catch (_e) {
|
|
28
|
+
searchParams.set(tokenKey, token_1);
|
|
29
|
+
}
|
|
25
30
|
searchParams.delete('code');
|
|
26
31
|
if (searchParams.get('state') === '')
|
|
27
32
|
searchParams.delete('state');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,15 +29,18 @@ export function oauth2Signer<I extends DataObject, O extends DataObject = {}>({
|
|
|
29
29
|
userProfile,
|
|
30
30
|
tokenKey = 'token'
|
|
31
31
|
}: OAuth2Option): Middleware<I, O> {
|
|
32
|
-
return async ({ req: { url, headers, cookies }, query }, next) => {
|
|
32
|
+
return async ({ req: { url, headers, cookies }, query, res }, next) => {
|
|
33
33
|
const token = cookies[tokenKey] || query[tokenKey];
|
|
34
34
|
const pageURL = new URL(url || '/', headers['origin'] || Host);
|
|
35
35
|
|
|
36
36
|
if (query.code) {
|
|
37
37
|
const token = await accessToken(query as OAuth2Ticket),
|
|
38
38
|
{ searchParams } = pageURL;
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
try {
|
|
40
|
+
res.setHeader('Set-Cookie', `${tokenKey}=${token}; Path=/`);
|
|
41
|
+
} catch {
|
|
42
|
+
searchParams.set(tokenKey, token);
|
|
43
|
+
}
|
|
41
44
|
searchParams.delete('code');
|
|
42
45
|
if (searchParams.get('state') === '') searchParams.delete('state');
|
|
43
46
|
|