next-ssr-middleware 0.9.0 → 0.9.1
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.
|
@@ -7,7 +7,7 @@ export type OAuth2Ticket = {
|
|
|
7
7
|
export interface OAuth2Option {
|
|
8
8
|
signInURL: (pageURL: string) => string;
|
|
9
9
|
accessToken: (ticket: OAuth2Ticket) => Promise<string>;
|
|
10
|
-
userProfile
|
|
10
|
+
userProfile?: (token: string) => Promise<DataObject>;
|
|
11
11
|
tokenKey?: string;
|
|
12
12
|
}
|
|
13
13
|
export interface OAuth2Props<T extends DataObject> {
|
|
@@ -11,11 +11,11 @@ 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, query = _b.query;
|
|
14
|
+
var _c = _b.req, url = _c.url, headers = _c.headers, cookies = _c.cookies, query = _b.query;
|
|
15
15
|
return tslib_1.__generator(this, function (_d) {
|
|
16
16
|
switch (_d.label) {
|
|
17
17
|
case 0:
|
|
18
|
-
token = query[tokenKey];
|
|
18
|
+
token = cookies[tokenKey] || query[tokenKey];
|
|
19
19
|
pageURL = new URL(url || '/', headers['origin'] || Host);
|
|
20
20
|
if (!query.code) return [3 /*break*/, 2];
|
|
21
21
|
return [4 /*yield*/, accessToken(query)];
|
|
@@ -31,7 +31,7 @@ function oauth2Signer(_a) {
|
|
|
31
31
|
}];
|
|
32
32
|
case 2:
|
|
33
33
|
if (!token) return [3 /*break*/, 5];
|
|
34
|
-
return [4 /*yield*/, userProfile(token + '')];
|
|
34
|
+
return [4 /*yield*/, (userProfile === null || userProfile === void 0 ? void 0 : userProfile(token + ''))];
|
|
35
35
|
case 3:
|
|
36
36
|
user = _d.sent();
|
|
37
37
|
return [4 /*yield*/, next()];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":";;AAyBA,oCAwCC;AA6BD,oCA8CC;;AA5ID,2CAA2C;AAsB3C,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;AACzD,IAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,kBAAW,MAAM,CAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC;AAEpE,SAAgB,YAAY,CAAkD,EAK/D;IALf,iBAwCC;QAvCG,SAAS,eAAA,EACT,WAAW,iBAAA,EACX,WAAW,iBAAA,EACX,gBAAkB,EAAlB,QAAQ,mBAAG,OAAO,KAAA;IAElB,OAAO,wFAAO,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../source/middleware/remote.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "next-ssr-middleware",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.1",
|
|
4
4
|
"license": "LGPL-3.0-or-later",
|
|
5
5
|
"author": "shiy2008@gmail.com",
|
|
6
6
|
"description": "Koa-like middlewares for Next.js Server Side Rendering",
|
|
@@ -33,17 +33,17 @@
|
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/jsonwebtoken": "^9.0.9",
|
|
36
|
-
"@types/node": "^22.14.
|
|
37
|
-
"@types/react": "^19.1.
|
|
36
|
+
"@types/node": "^22.14.1",
|
|
37
|
+
"@types/react": "^19.1.2",
|
|
38
38
|
"husky": "^9.1.7",
|
|
39
39
|
"koajax": "^3.1.2",
|
|
40
|
-
"lint-staged": "^15.5.
|
|
40
|
+
"lint-staged": "^15.5.1",
|
|
41
41
|
"mobx-i18n": "^0.6.0",
|
|
42
|
-
"next": "^15.
|
|
42
|
+
"next": "^15.3.0",
|
|
43
43
|
"open-cli": "^8.0.0",
|
|
44
44
|
"prettier": "^3.5.3",
|
|
45
|
-
"typedoc": "^0.28.
|
|
46
|
-
"typescript": "~5.8.
|
|
45
|
+
"typedoc": "^0.28.2",
|
|
46
|
+
"typescript": "~5.8.3"
|
|
47
47
|
},
|
|
48
48
|
"prettier": {
|
|
49
49
|
"singleQuote": true,
|
|
@@ -11,7 +11,7 @@ export type OAuth2Ticket = {
|
|
|
11
11
|
export interface OAuth2Option {
|
|
12
12
|
signInURL: (pageURL: string) => string;
|
|
13
13
|
accessToken: (ticket: OAuth2Ticket) => Promise<string>;
|
|
14
|
-
userProfile
|
|
14
|
+
userProfile?: (token: string) => Promise<DataObject>;
|
|
15
15
|
tokenKey?: string;
|
|
16
16
|
}
|
|
17
17
|
|
|
@@ -29,8 +29,8 @@ 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 }, query }, next) => {
|
|
33
|
-
const token = query[tokenKey];
|
|
32
|
+
return async ({ req: { url, headers, cookies }, query }, next) => {
|
|
33
|
+
const token = cookies[tokenKey] || query[tokenKey];
|
|
34
34
|
const pageURL = new URL(url || '/', headers['origin'] || Host);
|
|
35
35
|
|
|
36
36
|
if (query.code) {
|
|
@@ -47,7 +47,7 @@ export function oauth2Signer<I extends DataObject, O extends DataObject = {}>({
|
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
if (token) {
|
|
50
|
-
const user = await userProfile(token + ''),
|
|
50
|
+
const user = await userProfile?.(token + ''),
|
|
51
51
|
data = await next();
|
|
52
52
|
const props =
|
|
53
53
|
'props' in data ? { ...data.props, token, user } : ({} as O);
|