@smg-automotive/auth 6.6.4-lkappler-public-page-refresh.1 → 6.7.0-lkappeler-feat-getUser.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.
- package/README.md +4 -1
- package/dist/cjs/lib/request/getUserAndAccessToken.d.ts +5 -2
- package/dist/cjs/lib/request/getUserAndAccessToken.js +29 -3
- package/dist/cjs/lib/request/getUserAndAccessToken.js.map +1 -1
- package/dist/cjs/middleware.js +3 -0
- package/dist/cjs/middleware.js.map +1 -1
- package/dist/cjs/server.js +1 -0
- package/dist/cjs/server.js.map +1 -1
- package/dist/esm/lib/request/getUserAndAccessToken.d.ts +5 -2
- package/dist/esm/lib/request/getUserAndAccessToken.js +29 -4
- package/dist/esm/lib/request/getUserAndAccessToken.js.map +1 -1
- package/dist/esm/middleware.js +3 -0
- package/dist/esm/middleware.js.map +1 -1
- package/dist/esm/server.js +1 -1
- package/dist/server.d.ts +5 -3
- package/package.json +7 -7
package/README.md
CHANGED
|
@@ -256,10 +256,13 @@ const loginLink = getLoginLink({ auth0Config });
|
|
|
256
256
|
|
|
257
257
|
#### Session helpers
|
|
258
258
|
|
|
259
|
-
For simplifying session handling on the server side we provide
|
|
259
|
+
For simplifying session handling on the server side we provide two helpers one to get the user and one to get the user and access tokens
|
|
260
|
+
The functions share the same interface, the `getUser` function is non invasive and will return null if no user is present
|
|
261
|
+
In comparison `getUserAndAccessToken` with trow errors and attempt to refresh the access token in case it's expired
|
|
260
262
|
|
|
261
263
|
```ts
|
|
262
264
|
import { getUserAndAccessToken } from '@smg-automotive/auth';
|
|
265
|
+
import { getUser } from '@smg-automotive/auth';
|
|
263
266
|
```
|
|
264
267
|
|
|
265
268
|
The function expects the following arguments:
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NextApiRequest, NextApiResponse } from 'next';
|
|
2
2
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
3
|
import { SessionUser } from 'src/types/sessionUser';
|
|
4
|
-
|
|
4
|
+
interface GetUserAndAccessTokenArgs {
|
|
5
5
|
protocol: string;
|
|
6
6
|
host: string;
|
|
7
7
|
isProxied: boolean;
|
|
@@ -12,7 +12,10 @@ export declare const getUserAndAccessToken: ({ protocol, host, isProxied, contex
|
|
|
12
12
|
request: IncomingMessage;
|
|
13
13
|
response: ServerResponse;
|
|
14
14
|
};
|
|
15
|
-
}
|
|
15
|
+
}
|
|
16
|
+
export declare const getUser: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<SessionUser | null>;
|
|
17
|
+
export declare const getUserAndAccessToken: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<{
|
|
16
18
|
user: SessionUser;
|
|
17
19
|
accessToken: string;
|
|
18
20
|
}>;
|
|
21
|
+
export {};
|
|
@@ -4,8 +4,8 @@ var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
|
|
|
4
4
|
var getAuth0Instance = require('./getAuth0Instance.js');
|
|
5
5
|
var getAccessToken = require('./getAccessToken.js');
|
|
6
6
|
|
|
7
|
-
var
|
|
8
|
-
var auth0Instance, session
|
|
7
|
+
var getUser = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
8
|
+
var auth0Instance, session;
|
|
9
9
|
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, context = _b.context;
|
|
10
10
|
return tslib_es6.__generator(this, function (_c) {
|
|
11
11
|
switch (_c.label) {
|
|
@@ -19,9 +19,34 @@ var getUserAndAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [
|
|
|
19
19
|
case 1:
|
|
20
20
|
session = _c.sent();
|
|
21
21
|
if (!session || !session.user) {
|
|
22
|
+
return [2 /*return*/, null];
|
|
23
|
+
}
|
|
24
|
+
return [2 /*return*/, session.user];
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
}); };
|
|
28
|
+
var getUserAndAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
29
|
+
var auth0Instance, user, accessToken;
|
|
30
|
+
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, context = _b.context;
|
|
31
|
+
return tslib_es6.__generator(this, function (_c) {
|
|
32
|
+
switch (_c.label) {
|
|
33
|
+
case 0:
|
|
34
|
+
auth0Instance = getAuth0Instance.getAuth0Instance({
|
|
35
|
+
protocol: protocol,
|
|
36
|
+
host: host,
|
|
37
|
+
isProxied: isProxied,
|
|
38
|
+
});
|
|
39
|
+
return [4 /*yield*/, getUser({
|
|
40
|
+
protocol: protocol,
|
|
41
|
+
host: host,
|
|
42
|
+
isProxied: isProxied,
|
|
43
|
+
context: context,
|
|
44
|
+
})];
|
|
45
|
+
case 1:
|
|
46
|
+
user = _c.sent();
|
|
47
|
+
if (!user) {
|
|
22
48
|
throw new Error("[Auth] You expected the user to be logged in but that's not the case");
|
|
23
49
|
}
|
|
24
|
-
user = session.user;
|
|
25
50
|
return [4 /*yield*/, getAccessToken.getAccessToken({
|
|
26
51
|
auth0Instance: auth0Instance,
|
|
27
52
|
context: context,
|
|
@@ -37,5 +62,6 @@ var getUserAndAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [
|
|
|
37
62
|
});
|
|
38
63
|
}); };
|
|
39
64
|
|
|
65
|
+
exports.getUser = getUser;
|
|
40
66
|
exports.getUserAndAccessToken = getUserAndAccessToken;
|
|
41
67
|
//# sourceMappingURL=getUserAndAccessToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserAndAccessToken.js","sources":["../../../../../src/lib/request/getUserAndAccessToken.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAccessToken"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"getUserAndAccessToken.js","sources":["../../../../../src/lib/request/getUserAndAccessToken.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAccessToken"],"mappings":";;;;;;AAuBO,IAAM,OAAO,GAAG,2EAAO,EAKF,EAAA;;QAJ1B,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAED,aAAa,GAAGA,iCAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBAEc,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAA,KAAA,CAAxB,aAAa,GAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAC,CAAA;;AADnD,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAEf;gBAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AAC7B,oBAAA,OAAA,CAAA,CAAA,aAAO,IAAI,CAAA;gBACb;gBAEA,OAAA,CAAA,CAAA,aAAO,OAAO,CAAC,IAAmB,CAAA;;;;AAG7B,IAAM,qBAAqB,GAAG,2EAAO,EAKhB,EAAA;;QAJ1B,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAKD,aAAa,GAAGA,iCAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;AACW,gBAAA,OAAA,CAAA,CAAA,YAAM,OAAO,CAAC;AACzB,wBAAA,QAAQ,EAAA,QAAA;AACR,wBAAA,IAAI,EAAA,IAAA;AACJ,wBAAA,SAAS,EAAA,SAAA;AACT,wBAAA,OAAO,EAAA,OAAA;AACR,qBAAA,CAAC,CAAA;;AALI,gBAAA,IAAI,GAAG,EAAA,CAAA,IAAA,EAKX;gBACF,IAAI,CAAC,IAAI,EAAE;AACT,oBAAA,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE;gBACH;AAEqB,gBAAA,OAAA,CAAA,CAAA,YAAMC,6BAAc,CAAC;AACxC,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,OAAO,EAAA,OAAA;AACP,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;gBAJI,WAAW,IAAI,EAAA,CAAA,IAAA,EAInB,CAAW;gBAEb,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE;gBACH;AAEA,gBAAA,OAAA,CAAA,CAAA,aAAO,EAAE,IAAI,EAAA,IAAA,EAAE,WAAW,EAAA,WAAA,EAAE,CAAA;;;;;;;;"}
|
package/dist/cjs/middleware.js
CHANGED
|
@@ -51,6 +51,9 @@ var authMiddleware = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
51
51
|
error_1 = _a.sent();
|
|
52
52
|
authError = error_1;
|
|
53
53
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
54
|
+
if (!isProtected) {
|
|
55
|
+
return [2 /*return*/, response];
|
|
56
|
+
}
|
|
54
57
|
loginUrl = authLinks.getLoginLink({
|
|
55
58
|
auth0Config: auth0Config,
|
|
56
59
|
language: language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sources":["../../../src/middleware.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","NextResponse","__awaiter","getAccessToken","getLoginLink"],"mappings":";;;;;;;;;AAUO,IAAM,cAAc,GAAG,2EAAO,EAkBpC,EAAA;;QAjBC,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,gBAAgB,GAAA,EAAA,CAAA,gBAAA,EAChB,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;AAWD,gBAAA,EAAA,GAA+B,OAAO,CAAC,OAAO,EAA5C,MAAM,GAAA,EAAA,CAAA,MAAA,EAAE,QAAQ,GAAA,EAAA,CAAA,QAAA,EAAE,MAAM,GAAA,EAAA,CAAA,MAAA;AAC1B,gBAAA,aAAa,GAAGA,iCAAgB,CAAC,EAAE,IAAI,EAAA,IAAA,EAAE,QAAQ,EAAA,QAAA,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;gBAC/D,WAAW,GAAGC,oBAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;gBAE3C,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC;gBACrE,WAAW,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC;AAC7D,gBAAA,QAAQ,GAAGC,mBAAY,CAAC,IAAI,EAAE;gBACpB,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;;AAA3D,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAAiD;;;;AAKjE,gBAAA,IAAI,CAAC,WAAW,IAAI,EAAC,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,IAAI,CAAA,EAAE;AAClC,oBAAA,OAAA,CAAA,CAAA,aAAO,QAAQ,CAAA;gBACjB;AAEO,gBAAA,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,0BAA0B,CAAC,UAAO,GAAG,EAAA,EAAA,OAAAC,mBAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,YAAA;;;;wCACvC,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;;AAA9D,oCAAA,cAAc,GAAG,EAAA,CAAA,IAAA,EAA6C;0CAChE,cAAc,aAAd,cAAc,KAAA,MAAA,GAAA,MAAA,GAAd,cAAc,CAAE,IAAI,CAAA,EAApB,OAAA,CAAA,CAAA,YAAA,CAAA,CAAA;;;;AAEA,oCAAA,OAAA,CAAA,CAAA,YAAMC,6BAAc,CAAC;AACnB,4CAAA,aAAa,EAAA,aAAA;4CACb,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,UAAA,EAAE;AACnC,4CAAA,SAAS,EAAA,SAAA;AACV,yCAAA,CAAC,CAAA;;AAJF,oCAAA,EAAA,CAAA,IAAA,EAIE;;;;oCAEI,SAAS,GAAG,OAAkB;AACpC,oCAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sources":["../../../src/middleware.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","NextResponse","__awaiter","getAccessToken","getLoginLink"],"mappings":"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"}
|
package/dist/cjs/server.js
CHANGED
|
@@ -11,6 +11,7 @@ var isLoggedIn = require('./lib/request/isLoggedIn.js');
|
|
|
11
11
|
exports.getServerAuthPropsPages = pages.getServerAuthProps;
|
|
12
12
|
exports.getServerAuthPropsApp = app.getServerAuthProps;
|
|
13
13
|
exports.apiRoutesHandler = index.apiRoutesHandler;
|
|
14
|
+
exports.getUser = getUserAndAccessToken.getUser;
|
|
14
15
|
exports.getUserAndAccessToken = getUserAndAccessToken.getUserAndAccessToken;
|
|
15
16
|
exports.isLoggedIn = isLoggedIn.isLoggedIn;
|
|
16
17
|
//# sourceMappingURL=server.js.map
|
package/dist/cjs/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NextApiRequest, NextApiResponse } from 'next';
|
|
2
2
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
3
|
import { SessionUser } from 'src/types/sessionUser';
|
|
4
|
-
|
|
4
|
+
interface GetUserAndAccessTokenArgs {
|
|
5
5
|
protocol: string;
|
|
6
6
|
host: string;
|
|
7
7
|
isProxied: boolean;
|
|
@@ -12,7 +12,10 @@ export declare const getUserAndAccessToken: ({ protocol, host, isProxied, contex
|
|
|
12
12
|
request: IncomingMessage;
|
|
13
13
|
response: ServerResponse;
|
|
14
14
|
};
|
|
15
|
-
}
|
|
15
|
+
}
|
|
16
|
+
export declare const getUser: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<SessionUser | null>;
|
|
17
|
+
export declare const getUserAndAccessToken: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<{
|
|
16
18
|
user: SessionUser;
|
|
17
19
|
accessToken: string;
|
|
18
20
|
}>;
|
|
21
|
+
export {};
|
|
@@ -2,8 +2,8 @@ import { __awaiter, __generator } from '../../node_modules/tslib/tslib.es6.js';
|
|
|
2
2
|
import { getAuth0Instance } from './getAuth0Instance.js';
|
|
3
3
|
import { getAccessToken } from './getAccessToken.js';
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
var auth0Instance, session
|
|
5
|
+
var getUser = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
6
|
+
var auth0Instance, session;
|
|
7
7
|
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, context = _b.context;
|
|
8
8
|
return __generator(this, function (_c) {
|
|
9
9
|
switch (_c.label) {
|
|
@@ -17,9 +17,34 @@ var getUserAndAccessToken = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
17
17
|
case 1:
|
|
18
18
|
session = _c.sent();
|
|
19
19
|
if (!session || !session.user) {
|
|
20
|
+
return [2 /*return*/, null];
|
|
21
|
+
}
|
|
22
|
+
return [2 /*return*/, session.user];
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
}); };
|
|
26
|
+
var getUserAndAccessToken = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
27
|
+
var auth0Instance, user, accessToken;
|
|
28
|
+
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, context = _b.context;
|
|
29
|
+
return __generator(this, function (_c) {
|
|
30
|
+
switch (_c.label) {
|
|
31
|
+
case 0:
|
|
32
|
+
auth0Instance = getAuth0Instance({
|
|
33
|
+
protocol: protocol,
|
|
34
|
+
host: host,
|
|
35
|
+
isProxied: isProxied,
|
|
36
|
+
});
|
|
37
|
+
return [4 /*yield*/, getUser({
|
|
38
|
+
protocol: protocol,
|
|
39
|
+
host: host,
|
|
40
|
+
isProxied: isProxied,
|
|
41
|
+
context: context,
|
|
42
|
+
})];
|
|
43
|
+
case 1:
|
|
44
|
+
user = _c.sent();
|
|
45
|
+
if (!user) {
|
|
20
46
|
throw new Error("[Auth] You expected the user to be logged in but that's not the case");
|
|
21
47
|
}
|
|
22
|
-
user = session.user;
|
|
23
48
|
return [4 /*yield*/, getAccessToken({
|
|
24
49
|
auth0Instance: auth0Instance,
|
|
25
50
|
context: context,
|
|
@@ -35,5 +60,5 @@ var getUserAndAccessToken = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
35
60
|
});
|
|
36
61
|
}); };
|
|
37
62
|
|
|
38
|
-
export { getUserAndAccessToken };
|
|
63
|
+
export { getUser, getUserAndAccessToken };
|
|
39
64
|
//# sourceMappingURL=getUserAndAccessToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserAndAccessToken.js","sources":["../../../../../src/lib/request/getUserAndAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"getUserAndAccessToken.js","sources":["../../../../../src/lib/request/getUserAndAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAuBO,IAAM,OAAO,GAAG,iEAAO,EAKF,EAAA;;QAJ1B,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAED,aAAa,GAAG,gBAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBAEc,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAA,KAAA,CAAxB,aAAa,GAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAC,CAAA;;AADnD,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAEf;gBAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;AAC7B,oBAAA,OAAA,CAAA,CAAA,aAAO,IAAI,CAAA;gBACb;gBAEA,OAAA,CAAA,CAAA,aAAO,OAAO,CAAC,IAAmB,CAAA;;;;AAG7B,IAAM,qBAAqB,GAAG,iEAAO,EAKhB,EAAA;;QAJ1B,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAKD,aAAa,GAAG,gBAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;AACW,gBAAA,OAAA,CAAA,CAAA,YAAM,OAAO,CAAC;AACzB,wBAAA,QAAQ,EAAA,QAAA;AACR,wBAAA,IAAI,EAAA,IAAA;AACJ,wBAAA,SAAS,EAAA,SAAA;AACT,wBAAA,OAAO,EAAA,OAAA;AACR,qBAAA,CAAC,CAAA;;AALI,gBAAA,IAAI,GAAG,EAAA,CAAA,IAAA,EAKX;gBACF,IAAI,CAAC,IAAI,EAAE;AACT,oBAAA,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE;gBACH;AAEqB,gBAAA,OAAA,CAAA,CAAA,YAAM,cAAc,CAAC;AACxC,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,OAAO,EAAA,OAAA;AACP,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;gBAJI,WAAW,IAAI,EAAA,CAAA,IAAA,EAInB,CAAW;gBAEb,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE;gBACH;AAEA,gBAAA,OAAA,CAAA,CAAA,aAAO,EAAE,IAAI,EAAA,IAAA,EAAE,WAAW,EAAA,WAAA,EAAE,CAAA;;;;;;;"}
|
package/dist/esm/middleware.js
CHANGED
|
@@ -49,6 +49,9 @@ var authMiddleware = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
49
49
|
error_1 = _a.sent();
|
|
50
50
|
authError = error_1;
|
|
51
51
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
52
|
+
if (!isProtected) {
|
|
53
|
+
return [2 /*return*/, response];
|
|
54
|
+
}
|
|
52
55
|
loginUrl = getLoginLink({
|
|
53
56
|
auth0Config: auth0Config,
|
|
54
57
|
language: language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sources":["../../../src/middleware.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAUO,IAAM,cAAc,GAAG,iEAAO,EAkBpC,EAAA;;QAjBC,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,gBAAgB,GAAA,EAAA,CAAA,gBAAA,EAChB,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,OAAO,GAAA,EAAA,CAAA,OAAA;;;;AAWD,gBAAA,EAAA,GAA+B,OAAO,CAAC,OAAO,EAA5C,MAAM,GAAA,EAAA,CAAA,MAAA,EAAE,QAAQ,GAAA,EAAA,CAAA,QAAA,EAAE,MAAM,GAAA,EAAA,CAAA,MAAA;AAC1B,gBAAA,aAAa,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAA,IAAA,EAAE,QAAQ,EAAA,QAAA,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;gBAC/D,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;gBAE3C,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC;gBACrE,WAAW,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC;AAC7D,gBAAA,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE;gBACpB,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;;AAA3D,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAAiD;;;;AAKjE,gBAAA,IAAI,CAAC,WAAW,IAAI,EAAC,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,IAAI,CAAA,EAAE;AAClC,oBAAA,OAAA,CAAA,CAAA,aAAO,QAAQ,CAAA;gBACjB;AAEO,gBAAA,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,0BAA0B,CAAC,UAAO,GAAG,EAAA,EAAA,OAAA,SAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,YAAA;;;;wCACvC,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;;AAA9D,oCAAA,cAAc,GAAG,EAAA,CAAA,IAAA,EAA6C;0CAChE,cAAc,aAAd,cAAc,KAAA,MAAA,GAAA,MAAA,GAAd,cAAc,CAAE,IAAI,CAAA,EAApB,OAAA,CAAA,CAAA,YAAA,CAAA,CAAA;;;;AAEA,oCAAA,OAAA,CAAA,CAAA,YAAM,cAAc,CAAC;AACnB,4CAAA,aAAa,EAAA,aAAA;4CACb,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,UAAA,EAAE;AACnC,4CAAA,SAAS,EAAA,SAAA;AACV,yCAAA,CAAC,CAAA;;AAJF,oCAAA,EAAA,CAAA,IAAA,EAIE;;;;oCAEI,SAAS,GAAG,OAAkB;AACpC,oCAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sources":["../../../src/middleware.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/dist/esm/server.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { getServerAuthProps as getServerAuthPropsPages } from './getServerAuthProps/pages.js';
|
|
2
2
|
export { getServerAuthProps as getServerAuthPropsApp } from './getServerAuthProps/app.js';
|
|
3
3
|
export { apiRoutesHandler } from './apiRoutes/handlers/index.js';
|
|
4
|
-
export { getUserAndAccessToken } from './lib/request/getUserAndAccessToken.js';
|
|
4
|
+
export { getUser, getUserAndAccessToken } from './lib/request/getUserAndAccessToken.js';
|
|
5
5
|
export { isLoggedIn } from './lib/request/isLoggedIn.js';
|
|
6
6
|
//# sourceMappingURL=server.js.map
|
package/dist/server.d.ts
CHANGED
|
@@ -47,7 +47,7 @@ declare const apiRoutesHandler: ({ req, res, ...handlerCreatorParams }: HandlerC
|
|
|
47
47
|
res: NextApiResponse;
|
|
48
48
|
}) => any;
|
|
49
49
|
|
|
50
|
-
|
|
50
|
+
interface GetUserAndAccessTokenArgs {
|
|
51
51
|
protocol: string;
|
|
52
52
|
host: string;
|
|
53
53
|
isProxied: boolean;
|
|
@@ -58,7 +58,9 @@ declare const getUserAndAccessToken: ({ protocol, host, isProxied, context, }: {
|
|
|
58
58
|
request: IncomingMessage;
|
|
59
59
|
response: ServerResponse;
|
|
60
60
|
};
|
|
61
|
-
}
|
|
61
|
+
}
|
|
62
|
+
declare const getUser: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<SessionUser | null>;
|
|
63
|
+
declare const getUserAndAccessToken: ({ protocol, host, isProxied, context, }: GetUserAndAccessTokenArgs) => Promise<{
|
|
62
64
|
user: SessionUser;
|
|
63
65
|
accessToken: string;
|
|
64
66
|
}>;
|
|
@@ -76,4 +78,4 @@ declare const isLoggedIn: ({ protocol, host, isProxied, context, }: {
|
|
|
76
78
|
};
|
|
77
79
|
}) => Promise<boolean>;
|
|
78
80
|
|
|
79
|
-
export { AuthProps, apiRoutesHandler, getServerAuthProps as getServerAuthPropsApp, getServerAuthProps$1 as getServerAuthPropsPages, getUserAndAccessToken, isLoggedIn };
|
|
81
|
+
export { AuthProps, apiRoutesHandler, getServerAuthProps as getServerAuthPropsApp, getServerAuthProps$1 as getServerAuthPropsPages, getUser, getUserAndAccessToken, isLoggedIn };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smg-automotive/auth",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.7.0-lkappeler-feat-getUser.1",
|
|
4
4
|
"description": "SMG Automotive auth package",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -62,28 +62,28 @@
|
|
|
62
62
|
"@rollup/plugin-commonjs": "28.0.6",
|
|
63
63
|
"@rollup/plugin-node-resolve": "16.0.1",
|
|
64
64
|
"@rollup/plugin-typescript": "12.1.4",
|
|
65
|
-
"@smg-automotive/eslint-config": "5.0
|
|
65
|
+
"@smg-automotive/eslint-config": "5.1.0",
|
|
66
66
|
"@testing-library/dom": "10.4.1",
|
|
67
67
|
"@testing-library/jest-dom": "6.6.4",
|
|
68
68
|
"@testing-library/react": "16.3.0",
|
|
69
69
|
"@testing-library/user-event": "14.6.1",
|
|
70
70
|
"@types/jest": "29.5.14",
|
|
71
|
-
"@types/react": "19.1.
|
|
71
|
+
"@types/react": "19.1.9",
|
|
72
72
|
"dotenv": "17.2.1",
|
|
73
73
|
"jest": "29.7.0",
|
|
74
74
|
"jest-environment-jsdom": "29.7.0",
|
|
75
|
-
"next": "14.2.
|
|
75
|
+
"next": "14.2.31",
|
|
76
76
|
"react": "18.3.1",
|
|
77
77
|
"react-dom": "18.3.1",
|
|
78
78
|
"rimraf": "6.0.1",
|
|
79
|
-
"rollup": "4.46.
|
|
79
|
+
"rollup": "4.46.2",
|
|
80
80
|
"rollup-plugin-dts": "6.2.1",
|
|
81
81
|
"rollup-plugin-peer-deps-external": "2.2.4",
|
|
82
82
|
"rollup-plugin-preserve-directives": "0.4.0",
|
|
83
83
|
"semantic-release": "24.2.7",
|
|
84
|
-
"ts-jest": "29.4.
|
|
84
|
+
"ts-jest": "29.4.1",
|
|
85
85
|
"ts-node": "10.9.2",
|
|
86
|
-
"typescript": "5.
|
|
86
|
+
"typescript": "5.9.2",
|
|
87
87
|
"whatwg-fetch": "3.6.20"
|
|
88
88
|
},
|
|
89
89
|
"dependencies": {
|