@smg-automotive/auth 6.6.3 → 6.6.4
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/dist/cjs/middleware.js +19 -11
- package/dist/cjs/middleware.js.map +1 -1
- package/dist/esm/middleware.js +19 -11
- package/dist/esm/middleware.js.map +1 -1
- package/package.json +1 -1
package/dist/cjs/middleware.js
CHANGED
|
@@ -8,7 +8,7 @@ var authLinks = require('./lib/authLinks.js');
|
|
|
8
8
|
var auth0 = require('./config/auth0.js');
|
|
9
9
|
|
|
10
10
|
var authMiddleware = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
11
|
-
var _c, origin, pathname, search, auth0Instance, auth0Config, isAuthErrorRoute, isProtected;
|
|
11
|
+
var _c, origin, pathname, search, auth0Instance, auth0Config, isAuthErrorRoute, isProtected, response, session;
|
|
12
12
|
var request = _b.request, event = _b.event, isProtectedRoute = _b.isProtectedRoute, language = _b.language, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied, onError = _b.onError;
|
|
13
13
|
return tslib_es6.__generator(this, function (_d) {
|
|
14
14
|
switch (_d.label) {
|
|
@@ -18,19 +18,24 @@ var authMiddleware = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
18
18
|
auth0Config = auth0.getAuth0Config({ isProxied: isProxied });
|
|
19
19
|
isAuthErrorRoute = pathname.endsWith(auth0Config.globalAuthErrorPath);
|
|
20
20
|
isProtected = !isAuthErrorRoute && isProtectedRoute(pathname);
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
response = server.NextResponse.next();
|
|
22
|
+
return [4 /*yield*/, auth0Instance.getSession(request, response)];
|
|
23
|
+
case 1:
|
|
24
|
+
session = _d.sent();
|
|
25
|
+
// Skip any token refreshes if the page is public and no user is logged in
|
|
26
|
+
// On a public page with a logged in user, attempt to refresh the session
|
|
27
|
+
// as it can not be updated from the apps router
|
|
28
|
+
if (!isProtected && !(session === null || session === void 0 ? void 0 : session.user)) {
|
|
29
|
+
return [2 /*return*/, response];
|
|
23
30
|
}
|
|
24
|
-
return [4 /*yield*/, auth0Instance.withMiddlewareAuthRequired(function (req
|
|
25
|
-
var
|
|
31
|
+
return [4 /*yield*/, auth0Instance.withMiddlewareAuthRequired(function (req) { return tslib_es6.__awaiter(void 0, void 0, void 0, function () {
|
|
32
|
+
var wrappedSession, error_1, authError, loginUrl;
|
|
26
33
|
return tslib_es6.__generator(this, function (_a) {
|
|
27
34
|
switch (_a.label) {
|
|
28
|
-
case 0:
|
|
29
|
-
response = server.NextResponse.next();
|
|
30
|
-
return [4 /*yield*/, auth0Instance.getSession(req, response)];
|
|
35
|
+
case 0: return [4 /*yield*/, auth0Instance.getSession(req, response)];
|
|
31
36
|
case 1:
|
|
32
|
-
|
|
33
|
-
if (!(
|
|
37
|
+
wrappedSession = _a.sent();
|
|
38
|
+
if (!(wrappedSession === null || wrappedSession === void 0 ? void 0 : wrappedSession.user)) return [3 /*break*/, 5];
|
|
34
39
|
_a.label = 2;
|
|
35
40
|
case 2:
|
|
36
41
|
_a.trys.push([2, 4, , 5]);
|
|
@@ -46,6 +51,9 @@ var authMiddleware = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
46
51
|
error_1 = _a.sent();
|
|
47
52
|
authError = error_1;
|
|
48
53
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
54
|
+
if (!isProtected) {
|
|
55
|
+
return [2 /*return*/, response];
|
|
56
|
+
}
|
|
49
57
|
loginUrl = authLinks.getLoginLink({
|
|
50
58
|
auth0Config: auth0Config,
|
|
51
59
|
language: language,
|
|
@@ -58,7 +66,7 @@ var authMiddleware = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
58
66
|
}
|
|
59
67
|
});
|
|
60
68
|
}); })(request, event)];
|
|
61
|
-
case
|
|
69
|
+
case 2: return [2 /*return*/, _d.sent()];
|
|
62
70
|
}
|
|
63
71
|
});
|
|
64
72
|
}); };
|
|
@@ -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;
|
|
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/esm/middleware.js
CHANGED
|
@@ -6,7 +6,7 @@ import { getLoginLink } from './lib/authLinks.js';
|
|
|
6
6
|
import { getAuth0Config } from './config/auth0.js';
|
|
7
7
|
|
|
8
8
|
var authMiddleware = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
9
|
-
var _c, origin, pathname, search, auth0Instance, auth0Config, isAuthErrorRoute, isProtected;
|
|
9
|
+
var _c, origin, pathname, search, auth0Instance, auth0Config, isAuthErrorRoute, isProtected, response, session;
|
|
10
10
|
var request = _b.request, event = _b.event, isProtectedRoute = _b.isProtectedRoute, language = _b.language, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied, onError = _b.onError;
|
|
11
11
|
return __generator(this, function (_d) {
|
|
12
12
|
switch (_d.label) {
|
|
@@ -16,19 +16,24 @@ var authMiddleware = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
16
16
|
auth0Config = getAuth0Config({ isProxied: isProxied });
|
|
17
17
|
isAuthErrorRoute = pathname.endsWith(auth0Config.globalAuthErrorPath);
|
|
18
18
|
isProtected = !isAuthErrorRoute && isProtectedRoute(pathname);
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
response = NextResponse.next();
|
|
20
|
+
return [4 /*yield*/, auth0Instance.getSession(request, response)];
|
|
21
|
+
case 1:
|
|
22
|
+
session = _d.sent();
|
|
23
|
+
// Skip any token refreshes if the page is public and no user is logged in
|
|
24
|
+
// On a public page with a logged in user, attempt to refresh the session
|
|
25
|
+
// as it can not be updated from the apps router
|
|
26
|
+
if (!isProtected && !(session === null || session === void 0 ? void 0 : session.user)) {
|
|
27
|
+
return [2 /*return*/, response];
|
|
21
28
|
}
|
|
22
|
-
return [4 /*yield*/, auth0Instance.withMiddlewareAuthRequired(function (req
|
|
23
|
-
var
|
|
29
|
+
return [4 /*yield*/, auth0Instance.withMiddlewareAuthRequired(function (req) { return __awaiter(void 0, void 0, void 0, function () {
|
|
30
|
+
var wrappedSession, error_1, authError, loginUrl;
|
|
24
31
|
return __generator(this, function (_a) {
|
|
25
32
|
switch (_a.label) {
|
|
26
|
-
case 0:
|
|
27
|
-
response = NextResponse.next();
|
|
28
|
-
return [4 /*yield*/, auth0Instance.getSession(req, response)];
|
|
33
|
+
case 0: return [4 /*yield*/, auth0Instance.getSession(req, response)];
|
|
29
34
|
case 1:
|
|
30
|
-
|
|
31
|
-
if (!(
|
|
35
|
+
wrappedSession = _a.sent();
|
|
36
|
+
if (!(wrappedSession === null || wrappedSession === void 0 ? void 0 : wrappedSession.user)) return [3 /*break*/, 5];
|
|
32
37
|
_a.label = 2;
|
|
33
38
|
case 2:
|
|
34
39
|
_a.trys.push([2, 4, , 5]);
|
|
@@ -44,6 +49,9 @@ var authMiddleware = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
44
49
|
error_1 = _a.sent();
|
|
45
50
|
authError = error_1;
|
|
46
51
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
52
|
+
if (!isProtected) {
|
|
53
|
+
return [2 /*return*/, response];
|
|
54
|
+
}
|
|
47
55
|
loginUrl = getLoginLink({
|
|
48
56
|
auth0Config: auth0Config,
|
|
49
57
|
language: language,
|
|
@@ -56,7 +64,7 @@ var authMiddleware = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
56
64
|
}
|
|
57
65
|
});
|
|
58
66
|
}); })(request, event)];
|
|
59
|
-
case
|
|
67
|
+
case 2: return [2 /*return*/, _d.sent()];
|
|
60
68
|
}
|
|
61
69
|
});
|
|
62
70
|
}); };
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"middleware.js","sources":["../../../src/middleware.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|