@smg-automotive/auth 6.8.0-auth0-update-split-middleware.1 → 6.8.0-auth0-update-access-token-endpoint.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/dist/cjs/config/auth0.js +1 -2
- package/dist/cjs/config/auth0.js.map +1 -1
- package/dist/cjs/server/getAuth0Instance.js +1 -0
- package/dist/cjs/server/getAuth0Instance.js.map +1 -1
- package/dist/cjs/server/middleware/combineHeaders.d.ts +5 -0
- package/dist/cjs/server/middleware/combineHeaders.js +11 -0
- package/dist/cjs/server/middleware/combineHeaders.js.map +1 -0
- package/dist/cjs/server/middleware/index.js +21 -19
- package/dist/cjs/server/middleware/index.js.map +1 -1
- package/dist/cjs/server/middleware/login.d.ts +2 -3
- package/dist/cjs/server/middleware/login.js.map +1 -1
- package/dist/cjs/server/middleware/logout.d.ts +2 -3
- package/dist/cjs/server/middleware/logout.js +3 -6
- package/dist/cjs/server/middleware/logout.js.map +1 -1
- package/dist/cjs/server/middleware/protectRoute.d.ts +1 -2
- package/dist/cjs/server/middleware/protectRoute.js +22 -32
- package/dist/cjs/server/middleware/protectRoute.js.map +1 -1
- package/dist/cjs/server/middleware/refreshAccessToken.d.ts +9 -0
- package/dist/cjs/server/middleware/refreshAccessToken.js +17 -0
- package/dist/cjs/server/middleware/refreshAccessToken.js.map +1 -0
- package/dist/cjs/server/middleware/token.d.ts +5 -4
- package/dist/cjs/server/middleware/token.js +45 -7
- package/dist/cjs/server/middleware/token.js.map +1 -1
- package/dist/esm/config/auth0.js +1 -2
- package/dist/esm/config/auth0.js.map +1 -1
- package/dist/esm/server/getAuth0Instance.js +1 -0
- package/dist/esm/server/getAuth0Instance.js.map +1 -1
- package/dist/esm/server/middleware/combineHeaders.d.ts +5 -0
- package/dist/esm/server/middleware/combineHeaders.js +9 -0
- package/dist/esm/server/middleware/combineHeaders.js.map +1 -0
- package/dist/esm/server/middleware/index.js +22 -20
- package/dist/esm/server/middleware/index.js.map +1 -1
- package/dist/esm/server/middleware/login.d.ts +2 -3
- package/dist/esm/server/middleware/login.js.map +1 -1
- package/dist/esm/server/middleware/logout.d.ts +2 -3
- package/dist/esm/server/middleware/logout.js +3 -6
- package/dist/esm/server/middleware/logout.js.map +1 -1
- package/dist/esm/server/middleware/protectRoute.d.ts +1 -2
- package/dist/esm/server/middleware/protectRoute.js +22 -32
- package/dist/esm/server/middleware/protectRoute.js.map +1 -1
- package/dist/esm/server/middleware/refreshAccessToken.d.ts +9 -0
- package/dist/esm/server/middleware/refreshAccessToken.js +15 -0
- package/dist/esm/server/middleware/refreshAccessToken.js.map +1 -0
- package/dist/esm/server/middleware/token.d.ts +5 -4
- package/dist/esm/server/middleware/token.js +45 -7
- package/dist/esm/server/middleware/token.js.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/server/middleware/types.d.ts +0 -5
- package/dist/esm/server/middleware/types.d.ts +0 -5
package/dist/cjs/config/auth0.js
CHANGED
|
@@ -27,8 +27,7 @@ const auth0Config = {
|
|
|
27
27
|
// Endpoint where the user gets redirected to auth0 universal logout
|
|
28
28
|
logoutEndpoint: '/api/auth/logout',
|
|
29
29
|
// Endpoint to fetch and refresh token
|
|
30
|
-
|
|
31
|
-
tokenEndpoint: '/auth/access-token',
|
|
30
|
+
tokenEndpoint: '/api/auth/access-token',
|
|
32
31
|
// Endpoint to fetch and refresh token
|
|
33
32
|
callbackEndpoint: '/api/auth/callback',
|
|
34
33
|
// Endpoint to fetch user profile
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":["ensureString","ensureSlash"],"mappings":";;;;AAKA,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,aAAa;AACzE,MAAM,gBAAgB,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;AAE7E,MAAM,qBAAqB,GAAGA,kBAAY,CACxC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAClD;AACD,MAAM,sBAAsB,GAAGA,kBAAY,CACzC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CACnD;AAED,MAAM,aAAa,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAa;AAC1E,MAAM,gBAAgB,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB;KAChE,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAe;AAEhC,MAAM,iBAAiB,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AACtE,MAAM,QAAQ,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAEzD,MAAM,eAAe,GAAGA,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B;KAC5E,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAC;AAElB,IAAI,CAAC,aAAa,EAAE;AAClB,IAAA,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC;AAC7D;AAEA,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;AACjC,IAAA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC;AAChE;AAEA,MAAM,WAAW,GAAgB;;AAE/B,IAAA,aAAa,EAAE,iBAAiB;;AAEhC,IAAA,cAAc,EAAE,kBAAkB
|
|
1
|
+
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":["ensureString","ensureSlash"],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ const getAuth0Instance = ({ protocol, host, isProxied, onError, }) => {
|
|
|
33
33
|
scope: auth0Config.scopes,
|
|
34
34
|
audience: auth0Config.audience,
|
|
35
35
|
},
|
|
36
|
+
enableAccessTokenEndpoint: false,
|
|
36
37
|
beforeSessionSaved: beforeSessionSavedFactory.beforeSessionSavedFactory(auth0Config),
|
|
37
38
|
onCallback: onCallbackFactory.onCallbackFactory({ auth0Config, appBaseUrl, onError }),
|
|
38
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":["getAuth0Config","Auth0Client","beforeSessionSavedFactory","onCallbackFactory"],"mappings":";;;;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAGA,oBAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;AAC1C,IAAA,MAAM,WAAW,GAAG,IAAIC,kBAAW,CAAC;QAClC,UAAU;AACV,QAAA,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,aAAa;YAChC,MAAM,EAAE,WAAW,CAAC,cAAc;YAClC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;AACvC,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,MAAM,EAAE;gBACN,IAAI,EAAE,WAAW,CAAC,iBAAiB;AACpC,aAAA;AACF,SAAA;AACD,QAAA,uBAAuB,EAAE;YACvB,KAAK,EAAE,WAAW,CAAC,MAAM;YACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;AAC/B,SAAA;AACD,QAAA,kBAAkB,EAAEC,mDAAyB,CAAC,WAAW,CAAC;QAC1D,UAAU,EAAEC,mCAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpE,KAAA,CAAC;AACF,IAAA,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW;AAC5B,IAAA,OAAO,WAAW;AACpB;;;;"}
|
|
1
|
+
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":["getAuth0Config","Auth0Client","beforeSessionSavedFactory","onCallbackFactory"],"mappings":";;;;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAGA,oBAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;AAC1C,IAAA,MAAM,WAAW,GAAG,IAAIC,kBAAW,CAAC;QAClC,UAAU;AACV,QAAA,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,aAAa;YAChC,MAAM,EAAE,WAAW,CAAC,cAAc;YAClC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;AACvC,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,MAAM,EAAE;gBACN,IAAI,EAAE,WAAW,CAAC,iBAAiB;AACpC,aAAA;AACF,SAAA;AACD,QAAA,uBAAuB,EAAE;YACvB,KAAK,EAAE,WAAW,CAAC,MAAM;YACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;AAC/B,SAAA;AACD,QAAA,yBAAyB,EAAE,KAAK;AAChC,QAAA,kBAAkB,EAAEC,mDAAyB,CAAC,WAAW,CAAC;QAC1D,UAAU,EAAEC,mCAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpE,KAAA,CAAC;AACF,IAAA,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW;AAC5B,IAAA,OAAO,WAAW;AACpB;;;;"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const combineHeaders = ({ middlewareResponse, authResponse, }) => {
|
|
4
|
+
authResponse.headers.forEach((value, key) => {
|
|
5
|
+
middlewareResponse.headers.set(key, value);
|
|
6
|
+
});
|
|
7
|
+
return middlewareResponse;
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
exports.combineHeaders = combineHeaders;
|
|
11
|
+
//# sourceMappingURL=combineHeaders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"combineHeaders.js","sources":["../../../../../src/server/middleware/combineHeaders.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEO,MAAM,cAAc,GAAG,CAAC,EAC7B,kBAAkB,EAClB,YAAY,GAIb,KAAI;IACH,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,KAAI;QAC1C,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC;AAC5C,IAAA,CAAC,CAAC;AAEF,IAAA,OAAO,kBAAkB;AAC3B;;;;"}
|
|
@@ -7,6 +7,7 @@ var token = require('./token.js');
|
|
|
7
7
|
var protectRoute = require('./protectRoute.js');
|
|
8
8
|
var logout = require('./logout.js');
|
|
9
9
|
var login = require('./login.js');
|
|
10
|
+
var combineHeaders = require('./combineHeaders.js');
|
|
10
11
|
|
|
11
12
|
const isAuthRoute = (pathname, auth0Config) => {
|
|
12
13
|
const { loginEndpoint, logoutEndpoint, callbackEndpoint, userProfileEndpoint, tokenEndpoint, } = auth0Config;
|
|
@@ -29,15 +30,15 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
29
30
|
request,
|
|
30
31
|
auth0Config,
|
|
31
32
|
});
|
|
32
|
-
if (crossDomainLogoutResult
|
|
33
|
-
return crossDomainLogoutResult
|
|
33
|
+
if (crossDomainLogoutResult) {
|
|
34
|
+
return crossDomainLogoutResult;
|
|
34
35
|
}
|
|
35
36
|
const addLoginParamsFromCookiesResult = login.addLoginParamsFromCookies({
|
|
36
37
|
request,
|
|
37
38
|
auth0Config,
|
|
38
39
|
});
|
|
39
|
-
if (addLoginParamsFromCookiesResult
|
|
40
|
-
return addLoginParamsFromCookiesResult
|
|
40
|
+
if (addLoginParamsFromCookiesResult) {
|
|
41
|
+
return addLoginParamsFromCookiesResult;
|
|
41
42
|
}
|
|
42
43
|
const authResponse = await auth0Instance.middleware(request);
|
|
43
44
|
const deleteRelatedSessionCookiesResult = logout.deleteRelatedSessionCookies({
|
|
@@ -46,17 +47,19 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
46
47
|
response: authResponse,
|
|
47
48
|
auth0Config,
|
|
48
49
|
});
|
|
49
|
-
if (deleteRelatedSessionCookiesResult
|
|
50
|
-
return deleteRelatedSessionCookiesResult
|
|
50
|
+
if (deleteRelatedSessionCookiesResult) {
|
|
51
|
+
return deleteRelatedSessionCookiesResult;
|
|
51
52
|
}
|
|
52
|
-
const switchSelectedSellerIdResult = await token.
|
|
53
|
+
const switchSelectedSellerIdResult = await token.handleAccessTokenRequest({
|
|
53
54
|
request,
|
|
55
|
+
response: authResponse,
|
|
54
56
|
auth0Instance,
|
|
55
57
|
auth0Config,
|
|
56
58
|
language,
|
|
59
|
+
onError,
|
|
57
60
|
});
|
|
58
|
-
if (switchSelectedSellerIdResult
|
|
59
|
-
return switchSelectedSellerIdResult
|
|
61
|
+
if (switchSelectedSellerIdResult) {
|
|
62
|
+
return switchSelectedSellerIdResult;
|
|
60
63
|
}
|
|
61
64
|
if (isAuthRoute(pathname, auth0Config) || isAuthErrorRoute) {
|
|
62
65
|
return authResponse;
|
|
@@ -71,18 +74,17 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
71
74
|
response: authResponse,
|
|
72
75
|
onError,
|
|
73
76
|
});
|
|
74
|
-
if (protectRouteResult
|
|
75
|
-
return protectRouteResult
|
|
77
|
+
if (protectRouteResult) {
|
|
78
|
+
return protectRouteResult;
|
|
76
79
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
80
|
+
return combineHeaders.combineHeaders({
|
|
81
|
+
middlewareResponse: server.NextResponse.next({
|
|
82
|
+
request: {
|
|
83
|
+
headers: request.headers,
|
|
84
|
+
},
|
|
85
|
+
}),
|
|
86
|
+
authResponse,
|
|
84
87
|
});
|
|
85
|
-
return responseWithCombinedHeaders;
|
|
86
88
|
};
|
|
87
89
|
|
|
88
90
|
exports.authMiddleware = authMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","handleCrossDomainLogout","addLoginParamsFromCookies","deleteRelatedSessionCookies","
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","handleCrossDomainLogout","addLoginParamsFromCookies","deleteRelatedSessionCookies","handleAccessTokenRequest","protectRoute","combineHeaders","NextResponse"],"mappings":";;;;;;;;;;;AAaA,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,WAAwB,KAAI;AACjE,IAAA,MAAM,EACJ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,GAAG,WAAW;IAEf,OAAO;QACL,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,mBAAmB;QACnB,aAAa;AACd,KAAA,CAAC,QAAQ,CAAC,QAAQ,CAAC;AACtB,CAAC;MAEY,cAAc,GAAG,OAAO,EACnC,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,GASR,KAA2B;AAC1B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO;AACpC,IAAA,MAAM,aAAa,GAAGA,iCAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAErE,MAAM,WAAW,GAAGC,oBAAc,CAAC,EAAE,SAAS,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC;IAE3E,MAAM,uBAAuB,GAAGC,8BAAuB,CAAC;QACtD,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,uBAAuB,EAAE;AAC3B,QAAA,OAAO,uBAAuB;IAChC;IAEA,MAAM,+BAA+B,GAAGC,+BAAyB,CAAC;QAChE,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,+BAA+B,EAAE;AACnC,QAAA,OAAO,+BAA+B;IACxC;IAEA,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAE5D,MAAM,iCAAiC,GAAGC,kCAA2B,CAAC;QACpE,IAAI;QACJ,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,iCAAiC,EAAE;AACrC,QAAA,OAAO,iCAAiC;IAC1C;AAEA,IAAA,MAAM,4BAA4B,GAAG,MAAMC,8BAAwB,CAAC;QAClE,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,aAAa;QACb,WAAW;QACX,QAAQ;QACR,OAAO;AACR,KAAA,CAAC;IACF,IAAI,4BAA4B,EAAE;AAChC,QAAA,OAAO,4BAA4B;IACrC;IAEA,IAAI,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,gBAAgB,EAAE;AAC1D,QAAA,OAAO,YAAY;IACrB;IAEA,MAAM,WAAW,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC;AACnE,IAAA,MAAM,kBAAkB,GAAG,MAAMC,yBAAY,CAAC;QAC5C,WAAW;QACX,aAAa;QACb,WAAW;QACX,QAAQ;QACR,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,OAAO;AACR,KAAA,CAAC;IACF,IAAI,kBAAkB,EAAE;AACtB,QAAA,OAAO,kBAAkB;IAC3B;AAEA,IAAA,OAAOC,6BAAc,CAAC;AACpB,QAAA,kBAAkB,EAAEC,mBAAY,CAAC,IAAI,CAAC;AACpC,YAAA,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO;AACzB,aAAA;SACF,CAAC;QACF,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { NextRequest } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Auth0Config } from 'src/types';
|
|
3
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
4
3
|
export declare const addLoginParamsFromCookies: ({ request, auth0Config: { selectedSellerIdCookie, impersonatedSellerIdCookie, loginEndpoint, }, }: {
|
|
5
4
|
request: NextRequest;
|
|
6
5
|
auth0Config: Auth0Config;
|
|
7
|
-
}) =>
|
|
6
|
+
}) => NextResponse | void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,MAAM,yBAAyB,GAAG,CAAC,EACxC,OAAO,EACP,WAAW,EAAE,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,GACd,GAIF,KAAyB;AACxB,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,aAAa;QAAE;IAEhD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAChE,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;IACjD,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK;QACxE,IAAI,QAAQ,EAAE;AACZ,YAAA,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC;QACzC;IACF;IAEA,MAAM,sBAAsB,GAAG,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACxE,IAAI,CAAC,sBAAsB,EAAE;AAC3B,QAAA,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC9C,0BAA0B,CAAC,IAAI,CAChC,EAAE,KAAK;QAER,IAAI,oBAAoB,EAAE;AACxB,YAAA,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAC;QACjE;IACF;IAEA,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE;AAClD;;;;"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Auth0Config } from 'src/types';
|
|
3
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
4
3
|
export declare const handleCrossDomainLogout: ({ host, protocol, request, auth0Config: { languageConfig, logoutEndpoint }, }: {
|
|
5
4
|
host: string;
|
|
6
5
|
protocol: string;
|
|
7
6
|
request: NextRequest;
|
|
8
7
|
auth0Config: Auth0Config;
|
|
9
|
-
}) =>
|
|
8
|
+
}) => NextResponse | void;
|
|
10
9
|
export declare const deleteRelatedSessionCookies: ({ host, request, response, auth0Config: { logoutEndpoint, authCookieNames, legacyAccessTokenName, legacyRefreshTokenName, }, }: {
|
|
11
10
|
host: string;
|
|
12
11
|
request: NextRequest;
|
|
13
12
|
response: NextResponse;
|
|
14
13
|
auth0Config: Auth0Config;
|
|
15
|
-
}) =>
|
|
14
|
+
}) => NextResponse | void;
|
|
@@ -69,12 +69,9 @@ const handleCrossDomainLogout = ({ host, protocol, request, auth0Config: { langu
|
|
|
69
69
|
const otherDomainLogoutUrl = new URL(logoutEndpoint, `${protocol}://${otherDomainHost}`);
|
|
70
70
|
otherDomainLogoutUrl.searchParams.set('crossDomain', 'true');
|
|
71
71
|
otherDomainLogoutUrl.searchParams.set('returnTo', backToCurrentDomainUrl.toString());
|
|
72
|
-
return {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
status: 302,
|
|
76
|
-
}),
|
|
77
|
-
};
|
|
72
|
+
return server.NextResponse.redirect(otherDomainLogoutUrl, {
|
|
73
|
+
status: 302,
|
|
74
|
+
});
|
|
78
75
|
}
|
|
79
76
|
searchParams.set('returnTo', returnTo);
|
|
80
77
|
request.nextUrl.search = searchParams.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":["NextResponse"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":["NextResponse"],"mappings":";;;;AAIA,MAAM,gBAAgB,GAAG,CAAC,EACxB,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,eAAe,EACf,iBAAiB,GAOlB,KAAI;IACH,IAAI,OAAO,SAAS,KAAK,QAAQ;AAAE,QAAA,OAAO,KAAK;AAC/C,IAAA,IAAI,SAAS,CAAC,MAAM,GAAG,IAAI;AAAE,QAAA,OAAO,KAAK;AAEzC,IAAA,IAAI;AACF,QAAA,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,SAAS,CAAC;QACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC;QACjD,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,KAAK,GAAG,gBAAgB,GAAG,GAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,CAAA,EAAG,gBAAgB,CAAA,CAAE,CACtE;AACD,QAAA,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ;AAE5C,QAAA,IACE,iBAAiB;YACjB,KAAK;AACL,YAAA,eAAe,CAAC,IAAI,KAAK,eAAe,EACxC;AACA,YAAA,OAAO,KAAK;QACd;QAEA,IAAI,CAAC,iBAAiB,IAAI,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE;AACvD,YAAA,OAAO,KAAK;QACd;AAEA,QAAA,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;AAChE,YAAA,OAAO,KAAK;QACd;;;QAIA,MAAM,eAAe,GAAG,yBAAyB;AACjD,QAAA,OAAO,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC;IAC1C;IAAE,OAAO,KAAK,EAAE;;AAEd,QAAA,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC;AACjD,QAAA,OAAO,KAAK;IACd;AACF,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAmB,KAAY;AACzD,IAAA,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D;AACA,IAAA,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D;AACA,IAAA,OAAO,WAAW;AACpB,CAAC;MAEY,uBAAuB,GAAG,CAAC,EACtC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,GAMhD,KAAyB;AACxB,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,cAAc;QAAE;IAEjD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAEhE,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE;IAC5D,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,MAAM;AAEpE,IAAA,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC;AAChD,IAAA,IAAI,QAAQ,GAAG,CAAA,CAAA,EAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE;IACzE,MAAM,UAAU,GAAG,gBAAgB,CAAC;QAClC,QAAQ;QACR,IAAI;QACJ,eAAe;AACf,QAAA,SAAS,EAAE,iBAAiB;QAC5B,iBAAiB;AAClB,KAAA,CAAC;IACF,IAAI,UAAU,EAAE;QACd,QAAQ,GAAG,iBAAiB;IAC9B;IAEA,IAAI,CAAC,iBAAiB,IAAI,eAAe,IAAI,eAAe,KAAK,IAAI,EAAE;AACrE,QAAA,MAAM,gBAAgB,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;QAChD,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC;QACxE,sBAAsB,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC;QAC7D,sBAAsB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC;AAE9D,QAAA,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAClC,cAAc,EACd,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,eAAe,CAAA,CAAE,CACnC;QACD,oBAAoB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC;AAC5D,QAAA,oBAAoB,CAAC,YAAY,CAAC,GAAG,CACnC,UAAU,EACV,sBAAsB,CAAC,QAAQ,EAAE,CAClC;AAED,QAAA,OAAOA,mBAAY,CAAC,QAAQ,CAAC,oBAAoB,EAAE;AACjD,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CAAC;IACJ;AAEA,IAAA,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE;AAClD;AAEA,MAAM,qBAAqB,GAAG,CAAC,QAAgB,KAAI;IACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;AACjC,IAAA,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAA,CAAA,EAAI,QAAQ,CAAA,CAAE;AAE3C,IAAA,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IACtC,OAAO,CAAA,CAAA,EAAI,IAAI,CAAA,CAAE;AACnB,CAAC;AAEM,MAAM,2BAA2B,GAAG,CAAC,EAC1C,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,WAAW,EAAE,EACX,cAAc,EACd,eAAe,EACf,qBAAqB,EACrB,sBAAsB,GACvB,GAMF,KAAyB;IACxB,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,cAAc,IAAI,CAAC,QAAQ;QAAE;AAE9D,IAAA,eAAe,CAAC,OAAO,CAAC,CAAC,UAAU,KAAI;AACrC,QAAA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;AACtB,YAAA,IAAI,EAAE,UAAU;AAChB,YAAA,MAAM,EAAE,CAAC;AACT,YAAA,IAAI,EAAE,GAAG;AACV,SAAA,CAAC;AACF,QAAA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,CAAA,EAAG,UAAU,CAAA,GAAA,CAAK;AACxB,YAAA,MAAM,EAAE,CAAC;AACT,YAAA,IAAI,EAAE,GAAG;AACV,SAAA,CAAC;AACJ,IAAA,CAAC,CAAC;AAEF,IAAA,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,CAAC;AACtD,IAAA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;AACtB,QAAA,IAAI,EAAE,qBAAqB;AAC3B,QAAA,MAAM,EAAE,CAAC;AACT,QAAA,IAAI,EAAE,GAAG;AACT,QAAA,MAAM,EAAE,kBAAkB;AAC3B,KAAA,CAAC;AACF,IAAA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;AACtB,QAAA,IAAI,EAAE,sBAAsB;AAC5B,QAAA,MAAM,EAAE,CAAC;AACT,QAAA,IAAI,EAAE,GAAG;AACT,QAAA,MAAM,EAAE,kBAAkB;AAC3B,KAAA,CAAC;AACJ;;;;;"}
|
|
@@ -2,7 +2,6 @@ import { NextRequest, NextResponse } from 'next/server';
|
|
|
2
2
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
3
3
|
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
4
4
|
import { Auth0Config } from 'src/types';
|
|
5
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
6
5
|
export declare const protectRoute: ({ isProtected, auth0Instance, auth0Config, language, request, response, onError, }: {
|
|
7
6
|
isProtected: boolean;
|
|
8
7
|
auth0Instance: Auth0Client;
|
|
@@ -11,4 +10,4 @@ export declare const protectRoute: ({ isProtected, auth0Instance, auth0Config, l
|
|
|
11
10
|
request: NextRequest;
|
|
12
11
|
response: NextResponse;
|
|
13
12
|
onError?: (error: Error) => void;
|
|
14
|
-
}) => Promise<
|
|
13
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var server = require('next/server');
|
|
4
4
|
var authLinks = require('../../lib/authLinks.js');
|
|
5
|
+
var refreshAccessToken = require('./refreshAccessToken.js');
|
|
5
6
|
|
|
6
7
|
const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
|
|
7
8
|
const loginUrl = authLinks.getLoginLink({
|
|
@@ -9,21 +10,15 @@ const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
|
|
|
9
10
|
language,
|
|
10
11
|
returnTo,
|
|
11
12
|
});
|
|
12
|
-
return {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}),
|
|
16
|
-
isEarlyReturn: true,
|
|
17
|
-
};
|
|
13
|
+
return server.NextResponse.redirect(new URL(loginUrl, origin), {
|
|
14
|
+
status: 307,
|
|
15
|
+
});
|
|
18
16
|
};
|
|
19
17
|
const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language, request, response, onError, }) => {
|
|
20
18
|
const session = await auth0Instance.getSession(request);
|
|
21
19
|
const { pathname, search, origin } = request.nextUrl;
|
|
22
20
|
if (!isProtected && !session?.user) {
|
|
23
|
-
return
|
|
24
|
-
response,
|
|
25
|
-
isEarlyReturn: true,
|
|
26
|
-
};
|
|
21
|
+
return response;
|
|
27
22
|
}
|
|
28
23
|
if (!session && isProtected) {
|
|
29
24
|
return redirectToLogin({
|
|
@@ -33,28 +28,23 @@ const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language,
|
|
|
33
28
|
origin,
|
|
34
29
|
});
|
|
35
30
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
language,
|
|
54
|
-
returnTo: `${pathname}${search}`,
|
|
55
|
-
origin,
|
|
56
|
-
});
|
|
57
|
-
}
|
|
31
|
+
return refreshAccessToken.refreshAccessToken({
|
|
32
|
+
request,
|
|
33
|
+
response,
|
|
34
|
+
auth0Instance,
|
|
35
|
+
onFailure: (authError) => {
|
|
36
|
+
onError?.(authError);
|
|
37
|
+
if (!isProtected) {
|
|
38
|
+
return response;
|
|
39
|
+
}
|
|
40
|
+
return redirectToLogin({
|
|
41
|
+
auth0Config,
|
|
42
|
+
language,
|
|
43
|
+
returnTo: `${pathname}${search}`,
|
|
44
|
+
origin,
|
|
45
|
+
});
|
|
46
|
+
},
|
|
47
|
+
});
|
|
58
48
|
};
|
|
59
49
|
|
|
60
50
|
exports.protectRoute = protectRoute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":["getLoginLink","NextResponse"],"mappings":"
|
|
1
|
+
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":["getLoginLink","NextResponse","refreshAccessToken"],"mappings":";;;;;;AAUA,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAGA,sBAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAOC,mBAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;IAEpD,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;AAC3B,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,OAAOC,qCAAkB,CAAC;QACxB,OAAO;QACP,QAAQ;QACR,aAAa;AACb,QAAA,SAAS,EAAE,CAAC,SAAmB,KAAI;AACjC,YAAA,OAAO,GAAG,SAAS,CAAC;YAEpB,IAAI,CAAC,WAAW,EAAE;AAChB,gBAAA,OAAO,QAAQ;YACjB;AAEA,YAAA,OAAO,eAAe,CAAC;gBACrB,WAAW;gBACX,QAAQ;AACR,gBAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;gBAChC,MAAM;AACP,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
|
+
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
3
|
+
import { SdkError } from '@auth0/nextjs-auth0/errors';
|
|
4
|
+
export declare const refreshAccessToken: ({ request, response, auth0Instance, onFailure, }: {
|
|
5
|
+
request: NextRequest;
|
|
6
|
+
response: NextResponse;
|
|
7
|
+
auth0Instance: Auth0Client;
|
|
8
|
+
onFailure?: (error: SdkError) => NextResponse;
|
|
9
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const refreshAccessToken = async ({ request, response, auth0Instance, onFailure, }) => {
|
|
4
|
+
const session = await auth0Instance.getSession(request);
|
|
5
|
+
try {
|
|
6
|
+
const shouldRefresh = (session?.tokenSet.expiresAt || 0) < Date.now() / 1000 + 30;
|
|
7
|
+
await auth0Instance.getAccessToken(request, response, {
|
|
8
|
+
refresh: shouldRefresh,
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
catch (error) {
|
|
12
|
+
return onFailure?.(error);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
exports.refreshAccessToken = refreshAccessToken;
|
|
17
|
+
//# sourceMappingURL=refreshAccessToken.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refreshAccessToken.js","sources":["../../../../../src/server/middleware/refreshAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,MAAM,kBAAkB,GAAG,OAAO,EACvC,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GAMV,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;AAEvD,IAAA,IAAI;QACF,MAAM,aAAa,GACjB,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;AAC7D,QAAA,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE;AACpD,YAAA,OAAO,EAAE,aAAa;AACvB,SAAA,CAAC;IACJ;IAAE,OAAO,KAAK,EAAE;AACd,QAAA,OAAO,SAAS,GAAG,KAAiB,CAAC;IACvC;AACF;;;;"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { NextRequest } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
3
3
|
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
4
4
|
import { Auth0Config } from 'src/types';
|
|
5
|
-
|
|
6
|
-
export declare const switchSelectedSellerId: ({ language, request, auth0Instance, auth0Config, }: {
|
|
5
|
+
export declare const handleAccessTokenRequest: ({ language, request, response, auth0Instance, auth0Config, onError, }: {
|
|
7
6
|
language: Language;
|
|
8
7
|
request: NextRequest;
|
|
8
|
+
response: NextResponse;
|
|
9
9
|
auth0Instance: Auth0Client;
|
|
10
10
|
auth0Config: Auth0Config;
|
|
11
|
-
|
|
11
|
+
onError?: (error: Error) => void;
|
|
12
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -1,14 +1,26 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var server = require('next/server');
|
|
4
|
+
var errors = require('@auth0/nextjs-auth0/errors');
|
|
4
5
|
var authLinks = require('../../lib/authLinks.js');
|
|
6
|
+
var combineHeaders = require('./combineHeaders.js');
|
|
5
7
|
|
|
6
|
-
const
|
|
8
|
+
const handleAccessTokenRequest = async ({ language, request, response, auth0Instance, auth0Config, onError, }) => {
|
|
7
9
|
if (request.nextUrl.pathname !== auth0Config.tokenEndpoint)
|
|
8
10
|
return;
|
|
9
11
|
const searchParams = new URLSearchParams(request.nextUrl.search);
|
|
10
12
|
const sellerId = searchParams.get('seller_id');
|
|
11
13
|
const session = await auth0Instance.getSession(request);
|
|
14
|
+
if (!session) {
|
|
15
|
+
return server.NextResponse.json({
|
|
16
|
+
error: {
|
|
17
|
+
message: 'The user does not have an active session.',
|
|
18
|
+
code: errors.AccessTokenErrorCode.MISSING_SESSION,
|
|
19
|
+
},
|
|
20
|
+
}, {
|
|
21
|
+
status: 401,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
12
24
|
if (sellerId && session?.user) {
|
|
13
25
|
const loginUrl = authLinks.getLoginLink({
|
|
14
26
|
auth0Config,
|
|
@@ -16,14 +28,40 @@ const switchSelectedSellerId = async ({ language, request, auth0Instance, auth0C
|
|
|
16
28
|
returnTo: auth0Config.tokenEndpoint,
|
|
17
29
|
selectedSellerId: sellerId,
|
|
18
30
|
});
|
|
19
|
-
return {
|
|
20
|
-
|
|
21
|
-
|
|
31
|
+
return server.NextResponse.redirect(new URL(loginUrl, request.nextUrl.origin), {
|
|
32
|
+
status: 302,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
try {
|
|
36
|
+
const shouldRefresh = (session?.tokenSet.expiresAt || 0) < Date.now() / 1000 + 30;
|
|
37
|
+
const { token, expiresAt } = await auth0Instance.getAccessToken(request, response, {
|
|
38
|
+
refresh: shouldRefresh,
|
|
39
|
+
});
|
|
40
|
+
const tokenResponse = combineHeaders.combineHeaders({
|
|
41
|
+
middlewareResponse: server.NextResponse.json({
|
|
42
|
+
token,
|
|
43
|
+
expiresAt,
|
|
44
|
+
}, {
|
|
45
|
+
headers: request.headers,
|
|
22
46
|
}),
|
|
23
|
-
|
|
24
|
-
};
|
|
47
|
+
authResponse: response,
|
|
48
|
+
});
|
|
49
|
+
tokenResponse.headers.set('Cache-Control', 'private, no-cache, no-store, must-revalidate, max-age=0');
|
|
50
|
+
tokenResponse.headers.set('Pragma', 'no-cache');
|
|
51
|
+
tokenResponse.headers.set('Expires', '0');
|
|
52
|
+
return tokenResponse;
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
const authError = error;
|
|
56
|
+
onError?.(authError);
|
|
57
|
+
return server.NextResponse.json({
|
|
58
|
+
error: {
|
|
59
|
+
message: authError.message,
|
|
60
|
+
code: authError.code,
|
|
61
|
+
},
|
|
62
|
+
}, { status: 401 });
|
|
25
63
|
}
|
|
26
64
|
};
|
|
27
65
|
|
|
28
|
-
exports.
|
|
66
|
+
exports.handleAccessTokenRequest = handleAccessTokenRequest;
|
|
29
67
|
//# sourceMappingURL=token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":["getLoginLink","
|
|
1
|
+
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":["NextResponse","AccessTokenErrorCode","getLoginLink","combineHeaders"],"mappings":";;;;;;;MAWa,wBAAwB,GAAG,OAAO,EAC7C,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAQR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa;QAAE;IAE5D,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAEhE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAOA,mBAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;AACL,gBAAA,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAEC,2BAAoB,CAAC,eAAe;AAC3C,aAAA;SACF,EACD;AACE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CACF;IACH;AAEA,IAAA,IAAI,QAAQ,IAAI,OAAO,EAAE,IAAI,EAAE;QAC7B,MAAM,QAAQ,GAAGC,sBAAY,CAAC;YAC5B,WAAW;YACX,QAAQ;YACR,QAAQ,EAAE,WAAW,CAAC,aAAa;AACnC,YAAA,gBAAgB,EAAE,QAAQ;AAC3B,SAAA,CAAC;AACF,QAAA,OAAOF,mBAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;AACtE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;QACF,MAAM,aAAa,GACjB,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;AAC7D,QAAA,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,cAAc,CAC7D,OAAO,EACP,QAAQ,EACR;AACE,YAAA,OAAO,EAAE,aAAa;AACvB,SAAA,CACF;QAED,MAAM,aAAa,GAAGG,6BAAc,CAAC;AACnC,YAAA,kBAAkB,EAAEH,mBAAY,CAAC,IAAI,CACnC;gBACE,KAAK;gBACL,SAAS;aACV,EACD;gBACE,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CACF;AACD,YAAA,YAAY,EAAE,QAAQ;AACvB,SAAA,CAAC;QACF,aAAa,CAAC,OAAO,CAAC,GAAG,CACvB,eAAe,EACf,yDAAyD,CAC1D;QACD,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC/C,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC;AAEzC,QAAA,OAAO,aAAa;IACtB;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;QAEpB,OAAOA,mBAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;gBACL,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,IAAI,EAAE,SAAS,CAAC,IAAI;AACrB,aAAA;AACF,SAAA,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB;IACH;AACF;;;;"}
|
package/dist/esm/config/auth0.js
CHANGED
|
@@ -25,8 +25,7 @@ const auth0Config = {
|
|
|
25
25
|
// Endpoint where the user gets redirected to auth0 universal logout
|
|
26
26
|
logoutEndpoint: '/api/auth/logout',
|
|
27
27
|
// Endpoint to fetch and refresh token
|
|
28
|
-
|
|
29
|
-
tokenEndpoint: '/auth/access-token',
|
|
28
|
+
tokenEndpoint: '/api/auth/access-token',
|
|
30
29
|
// Endpoint to fetch and refresh token
|
|
31
30
|
callbackEndpoint: '/api/auth/callback',
|
|
32
31
|
// Endpoint to fetch user profile
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,aAAa;AACzE,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;AAE7E,MAAM,qBAAqB,GAAG,YAAY,CACxC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAClD;AACD,MAAM,sBAAsB,GAAG,YAAY,CACzC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CACnD;AAED,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAa;AAC1E,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB;KAChE,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAe;AAEhC,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AACtE,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAEzD,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B;KAC5E,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAC;AAElB,IAAI,CAAC,aAAa,EAAE;AAClB,IAAA,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC;AAC7D;AAEA,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;AACjC,IAAA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC;AAChE;AAEA,MAAM,WAAW,GAAgB;;AAE/B,IAAA,aAAa,EAAE,iBAAiB;;AAEhC,IAAA,cAAc,EAAE,kBAAkB
|
|
1
|
+
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ const getAuth0Instance = ({ protocol, host, isProxied, onError, }) => {
|
|
|
31
31
|
scope: auth0Config.scopes,
|
|
32
32
|
audience: auth0Config.audience,
|
|
33
33
|
},
|
|
34
|
+
enableAccessTokenEndpoint: false,
|
|
34
35
|
beforeSessionSaved: beforeSessionSavedFactory(auth0Config),
|
|
35
36
|
onCallback: onCallbackFactory({ auth0Config, appBaseUrl, onError }),
|
|
36
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;AAC1C,IAAA,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,UAAU;AACV,QAAA,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,aAAa;YAChC,MAAM,EAAE,WAAW,CAAC,cAAc;YAClC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;AACvC,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,MAAM,EAAE;gBACN,IAAI,EAAE,WAAW,CAAC,iBAAiB;AACpC,aAAA;AACF,SAAA;AACD,QAAA,uBAAuB,EAAE;YACvB,KAAK,EAAE,WAAW,CAAC,MAAM;YACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;AAC/B,SAAA;AACD,QAAA,kBAAkB,EAAE,yBAAyB,CAAC,WAAW,CAAC;QAC1D,UAAU,EAAE,iBAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpE,KAAA,CAAC;AACF,IAAA,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW;AAC5B,IAAA,OAAO,WAAW;AACpB;;;;"}
|
|
1
|
+
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;AAC1C,IAAA,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,UAAU;AACV,QAAA,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,aAAa;YAChC,MAAM,EAAE,WAAW,CAAC,cAAc;YAClC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;AACvC,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,MAAM,EAAE;gBACN,IAAI,EAAE,WAAW,CAAC,iBAAiB;AACpC,aAAA;AACF,SAAA;AACD,QAAA,uBAAuB,EAAE;YACvB,KAAK,EAAE,WAAW,CAAC,MAAM;YACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;AAC/B,SAAA;AACD,QAAA,yBAAyB,EAAE,KAAK;AAChC,QAAA,kBAAkB,EAAE,yBAAyB,CAAC,WAAW,CAAC;QAC1D,UAAU,EAAE,iBAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpE,KAAA,CAAC;AACF,IAAA,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW;AAC5B,IAAA,OAAO,WAAW;AACpB;;;;"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
const combineHeaders = ({ middlewareResponse, authResponse, }) => {
|
|
2
|
+
authResponse.headers.forEach((value, key) => {
|
|
3
|
+
middlewareResponse.headers.set(key, value);
|
|
4
|
+
});
|
|
5
|
+
return middlewareResponse;
|
|
6
|
+
};
|
|
7
|
+
|
|
8
|
+
export { combineHeaders };
|
|
9
|
+
//# sourceMappingURL=combineHeaders.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"combineHeaders.js","sources":["../../../../../src/server/middleware/combineHeaders.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEO,MAAM,cAAc,GAAG,CAAC,EAC7B,kBAAkB,EAClB,YAAY,GAIb,KAAI;IACH,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,KAAI;QAC1C,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC;AAC5C,IAAA,CAAC,CAAC;AAEF,IAAA,OAAO,kBAAkB;AAC3B;;;;"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { NextResponse } from 'next/server';
|
|
2
2
|
import { getAuth0Config } from '../../config/auth0.js';
|
|
3
3
|
import { getAuth0Instance } from '../getAuth0Instance.js';
|
|
4
|
-
import {
|
|
4
|
+
import { handleAccessTokenRequest } from './token.js';
|
|
5
5
|
import { protectRoute } from './protectRoute.js';
|
|
6
6
|
import { handleCrossDomainLogout, deleteRelatedSessionCookies } from './logout.js';
|
|
7
7
|
import { addLoginParamsFromCookies } from './login.js';
|
|
8
|
+
import { combineHeaders } from './combineHeaders.js';
|
|
8
9
|
|
|
9
10
|
const isAuthRoute = (pathname, auth0Config) => {
|
|
10
11
|
const { loginEndpoint, logoutEndpoint, callbackEndpoint, userProfileEndpoint, tokenEndpoint, } = auth0Config;
|
|
@@ -27,15 +28,15 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
27
28
|
request,
|
|
28
29
|
auth0Config,
|
|
29
30
|
});
|
|
30
|
-
if (crossDomainLogoutResult
|
|
31
|
-
return crossDomainLogoutResult
|
|
31
|
+
if (crossDomainLogoutResult) {
|
|
32
|
+
return crossDomainLogoutResult;
|
|
32
33
|
}
|
|
33
34
|
const addLoginParamsFromCookiesResult = addLoginParamsFromCookies({
|
|
34
35
|
request,
|
|
35
36
|
auth0Config,
|
|
36
37
|
});
|
|
37
|
-
if (addLoginParamsFromCookiesResult
|
|
38
|
-
return addLoginParamsFromCookiesResult
|
|
38
|
+
if (addLoginParamsFromCookiesResult) {
|
|
39
|
+
return addLoginParamsFromCookiesResult;
|
|
39
40
|
}
|
|
40
41
|
const authResponse = await auth0Instance.middleware(request);
|
|
41
42
|
const deleteRelatedSessionCookiesResult = deleteRelatedSessionCookies({
|
|
@@ -44,17 +45,19 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
44
45
|
response: authResponse,
|
|
45
46
|
auth0Config,
|
|
46
47
|
});
|
|
47
|
-
if (deleteRelatedSessionCookiesResult
|
|
48
|
-
return deleteRelatedSessionCookiesResult
|
|
48
|
+
if (deleteRelatedSessionCookiesResult) {
|
|
49
|
+
return deleteRelatedSessionCookiesResult;
|
|
49
50
|
}
|
|
50
|
-
const switchSelectedSellerIdResult = await
|
|
51
|
+
const switchSelectedSellerIdResult = await handleAccessTokenRequest({
|
|
51
52
|
request,
|
|
53
|
+
response: authResponse,
|
|
52
54
|
auth0Instance,
|
|
53
55
|
auth0Config,
|
|
54
56
|
language,
|
|
57
|
+
onError,
|
|
55
58
|
});
|
|
56
|
-
if (switchSelectedSellerIdResult
|
|
57
|
-
return switchSelectedSellerIdResult
|
|
59
|
+
if (switchSelectedSellerIdResult) {
|
|
60
|
+
return switchSelectedSellerIdResult;
|
|
58
61
|
}
|
|
59
62
|
if (isAuthRoute(pathname, auth0Config) || isAuthErrorRoute) {
|
|
60
63
|
return authResponse;
|
|
@@ -69,18 +72,17 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
69
72
|
response: authResponse,
|
|
70
73
|
onError,
|
|
71
74
|
});
|
|
72
|
-
if (protectRouteResult
|
|
73
|
-
return protectRouteResult
|
|
75
|
+
if (protectRouteResult) {
|
|
76
|
+
return protectRouteResult;
|
|
74
77
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
78
|
+
return combineHeaders({
|
|
79
|
+
middlewareResponse: NextResponse.next({
|
|
80
|
+
request: {
|
|
81
|
+
headers: request.headers,
|
|
82
|
+
},
|
|
83
|
+
}),
|
|
84
|
+
authResponse,
|
|
82
85
|
});
|
|
83
|
-
return responseWithCombinedHeaders;
|
|
84
86
|
};
|
|
85
87
|
|
|
86
88
|
export { authMiddleware };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AAaA,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,WAAwB,KAAI;AACjE,IAAA,MAAM,EACJ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,GAAG,WAAW;IAEf,OAAO;QACL,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,mBAAmB;QACnB,aAAa;AACd,KAAA,CAAC,QAAQ,CAAC,QAAQ,CAAC;AACtB,CAAC;MAEY,cAAc,GAAG,OAAO,EACnC,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,GASR,KAA2B;AAC1B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO;AACpC,IAAA,MAAM,aAAa,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAErE,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC;IAE3E,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;QACtD,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,uBAAuB,EAAE;AAC3B,QAAA,OAAO,uBAAuB;IAChC;IAEA,MAAM,+BAA+B,GAAG,yBAAyB,CAAC;QAChE,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,+BAA+B,EAAE;AACnC,QAAA,OAAO,+BAA+B;IACxC;IAEA,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAE5D,MAAM,iCAAiC,GAAG,2BAA2B,CAAC;QACpE,IAAI;QACJ,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,iCAAiC,EAAE;AACrC,QAAA,OAAO,iCAAiC;IAC1C;AAEA,IAAA,MAAM,4BAA4B,GAAG,MAAM,wBAAwB,CAAC;QAClE,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,aAAa;QACb,WAAW;QACX,QAAQ;QACR,OAAO;AACR,KAAA,CAAC;IACF,IAAI,4BAA4B,EAAE;AAChC,QAAA,OAAO,4BAA4B;IACrC;IAEA,IAAI,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,gBAAgB,EAAE;AAC1D,QAAA,OAAO,YAAY;IACrB;IAEA,MAAM,WAAW,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC;AACnE,IAAA,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC;QAC5C,WAAW;QACX,aAAa;QACb,WAAW;QACX,QAAQ;QACR,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,OAAO;AACR,KAAA,CAAC;IACF,IAAI,kBAAkB,EAAE;AACtB,QAAA,OAAO,kBAAkB;IAC3B;AAEA,IAAA,OAAO,cAAc,CAAC;AACpB,QAAA,kBAAkB,EAAE,YAAY,CAAC,IAAI,CAAC;AACpC,YAAA,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO;AACzB,aAAA;SACF,CAAC;QACF,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { NextRequest } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Auth0Config } from 'src/types';
|
|
3
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
4
3
|
export declare const addLoginParamsFromCookies: ({ request, auth0Config: { selectedSellerIdCookie, impersonatedSellerIdCookie, loginEndpoint, }, }: {
|
|
5
4
|
request: NextRequest;
|
|
6
5
|
auth0Config: Auth0Config;
|
|
7
|
-
}) =>
|
|
6
|
+
}) => NextResponse | void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":"AAIO,MAAM,yBAAyB,GAAG,CAAC,EACxC,OAAO,EACP,WAAW,EAAE,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,GACd,GAIF,KAAyB;AACxB,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,aAAa;QAAE;IAEhD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAChE,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;IACjD,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK;QACxE,IAAI,QAAQ,EAAE;AACZ,YAAA,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC;QACzC;IACF;IAEA,MAAM,sBAAsB,GAAG,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACxE,IAAI,CAAC,sBAAsB,EAAE;AAC3B,QAAA,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC9C,0BAA0B,CAAC,IAAI,CAChC,EAAE,KAAK;QAER,IAAI,oBAAoB,EAAE;AACxB,YAAA,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAC;QACjE;IACF;IAEA,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE;AAClD;;;;"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Auth0Config } from 'src/types';
|
|
3
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
4
3
|
export declare const handleCrossDomainLogout: ({ host, protocol, request, auth0Config: { languageConfig, logoutEndpoint }, }: {
|
|
5
4
|
host: string;
|
|
6
5
|
protocol: string;
|
|
7
6
|
request: NextRequest;
|
|
8
7
|
auth0Config: Auth0Config;
|
|
9
|
-
}) =>
|
|
8
|
+
}) => NextResponse | void;
|
|
10
9
|
export declare const deleteRelatedSessionCookies: ({ host, request, response, auth0Config: { logoutEndpoint, authCookieNames, legacyAccessTokenName, legacyRefreshTokenName, }, }: {
|
|
11
10
|
host: string;
|
|
12
11
|
request: NextRequest;
|
|
13
12
|
response: NextResponse;
|
|
14
13
|
auth0Config: Auth0Config;
|
|
15
|
-
}) =>
|
|
14
|
+
}) => NextResponse | void;
|
|
@@ -67,12 +67,9 @@ const handleCrossDomainLogout = ({ host, protocol, request, auth0Config: { langu
|
|
|
67
67
|
const otherDomainLogoutUrl = new URL(logoutEndpoint, `${protocol}://${otherDomainHost}`);
|
|
68
68
|
otherDomainLogoutUrl.searchParams.set('crossDomain', 'true');
|
|
69
69
|
otherDomainLogoutUrl.searchParams.set('returnTo', backToCurrentDomainUrl.toString());
|
|
70
|
-
return {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
status: 302,
|
|
74
|
-
}),
|
|
75
|
-
};
|
|
70
|
+
return NextResponse.redirect(otherDomainLogoutUrl, {
|
|
71
|
+
status: 302,
|
|
72
|
+
});
|
|
76
73
|
}
|
|
77
74
|
searchParams.set('returnTo', returnTo);
|
|
78
75
|
request.nextUrl.search = searchParams.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { NextRequest, NextResponse } from 'next/server';
|
|
|
2
2
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
3
3
|
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
4
4
|
import { Auth0Config } from 'src/types';
|
|
5
|
-
import { MiddlewareRouteHandlerResult } from './types';
|
|
6
5
|
export declare const protectRoute: ({ isProtected, auth0Instance, auth0Config, language, request, response, onError, }: {
|
|
7
6
|
isProtected: boolean;
|
|
8
7
|
auth0Instance: Auth0Client;
|
|
@@ -11,4 +10,4 @@ export declare const protectRoute: ({ isProtected, auth0Instance, auth0Config, l
|
|
|
11
10
|
request: NextRequest;
|
|
12
11
|
response: NextResponse;
|
|
13
12
|
onError?: (error: Error) => void;
|
|
14
|
-
}) => Promise<
|
|
13
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { NextResponse } from 'next/server';
|
|
2
2
|
import { getLoginLink } from '../../lib/authLinks.js';
|
|
3
|
+
import { refreshAccessToken } from './refreshAccessToken.js';
|
|
3
4
|
|
|
4
5
|
const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
|
|
5
6
|
const loginUrl = getLoginLink({
|
|
@@ -7,21 +8,15 @@ const redirectToLogin = ({ auth0Config, language, returnTo, origin, }) => {
|
|
|
7
8
|
language,
|
|
8
9
|
returnTo,
|
|
9
10
|
});
|
|
10
|
-
return {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}),
|
|
14
|
-
isEarlyReturn: true,
|
|
15
|
-
};
|
|
11
|
+
return NextResponse.redirect(new URL(loginUrl, origin), {
|
|
12
|
+
status: 307,
|
|
13
|
+
});
|
|
16
14
|
};
|
|
17
15
|
const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language, request, response, onError, }) => {
|
|
18
16
|
const session = await auth0Instance.getSession(request);
|
|
19
17
|
const { pathname, search, origin } = request.nextUrl;
|
|
20
18
|
if (!isProtected && !session?.user) {
|
|
21
|
-
return
|
|
22
|
-
response,
|
|
23
|
-
isEarlyReturn: true,
|
|
24
|
-
};
|
|
19
|
+
return response;
|
|
25
20
|
}
|
|
26
21
|
if (!session && isProtected) {
|
|
27
22
|
return redirectToLogin({
|
|
@@ -31,28 +26,23 @@ const protectRoute = async ({ isProtected, auth0Instance, auth0Config, language,
|
|
|
31
26
|
origin,
|
|
32
27
|
});
|
|
33
28
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
language,
|
|
52
|
-
returnTo: `${pathname}${search}`,
|
|
53
|
-
origin,
|
|
54
|
-
});
|
|
55
|
-
}
|
|
29
|
+
return refreshAccessToken({
|
|
30
|
+
request,
|
|
31
|
+
response,
|
|
32
|
+
auth0Instance,
|
|
33
|
+
onFailure: (authError) => {
|
|
34
|
+
onError?.(authError);
|
|
35
|
+
if (!isProtected) {
|
|
36
|
+
return response;
|
|
37
|
+
}
|
|
38
|
+
return redirectToLogin({
|
|
39
|
+
auth0Config,
|
|
40
|
+
language,
|
|
41
|
+
returnTo: `${pathname}${search}`,
|
|
42
|
+
origin,
|
|
43
|
+
});
|
|
44
|
+
},
|
|
45
|
+
});
|
|
56
46
|
};
|
|
57
47
|
|
|
58
48
|
export { protectRoute };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;IAEpD,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;AAC3B,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,OAAO,kBAAkB,CAAC;QACxB,OAAO;QACP,QAAQ;QACR,aAAa;AACb,QAAA,SAAS,EAAE,CAAC,SAAmB,KAAI;AACjC,YAAA,OAAO,GAAG,SAAS,CAAC;YAEpB,IAAI,CAAC,WAAW,EAAE;AAChB,gBAAA,OAAO,QAAQ;YACjB;AAEA,YAAA,OAAO,eAAe,CAAC;gBACrB,WAAW;gBACX,QAAQ;AACR,gBAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;gBAChC,MAAM;AACP,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
|
+
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
3
|
+
import { SdkError } from '@auth0/nextjs-auth0/errors';
|
|
4
|
+
export declare const refreshAccessToken: ({ request, response, auth0Instance, onFailure, }: {
|
|
5
|
+
request: NextRequest;
|
|
6
|
+
response: NextResponse;
|
|
7
|
+
auth0Instance: Auth0Client;
|
|
8
|
+
onFailure?: (error: SdkError) => NextResponse;
|
|
9
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
const refreshAccessToken = async ({ request, response, auth0Instance, onFailure, }) => {
|
|
2
|
+
const session = await auth0Instance.getSession(request);
|
|
3
|
+
try {
|
|
4
|
+
const shouldRefresh = (session?.tokenSet.expiresAt || 0) < Date.now() / 1000 + 30;
|
|
5
|
+
await auth0Instance.getAccessToken(request, response, {
|
|
6
|
+
refresh: shouldRefresh,
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
catch (error) {
|
|
10
|
+
return onFailure?.(error);
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export { refreshAccessToken };
|
|
15
|
+
//# sourceMappingURL=refreshAccessToken.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refreshAccessToken.js","sources":["../../../../../src/server/middleware/refreshAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":"AAIO,MAAM,kBAAkB,GAAG,OAAO,EACvC,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GAMV,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;AAEvD,IAAA,IAAI;QACF,MAAM,aAAa,GACjB,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;AAC7D,QAAA,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE;AACpD,YAAA,OAAO,EAAE,aAAa;AACvB,SAAA,CAAC;IACJ;IAAE,OAAO,KAAK,EAAE;AACd,QAAA,OAAO,SAAS,GAAG,KAAiB,CAAC;IACvC;AACF;;;;"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { NextRequest } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
3
3
|
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
4
4
|
import { Auth0Config } from 'src/types';
|
|
5
|
-
|
|
6
|
-
export declare const switchSelectedSellerId: ({ language, request, auth0Instance, auth0Config, }: {
|
|
5
|
+
export declare const handleAccessTokenRequest: ({ language, request, response, auth0Instance, auth0Config, onError, }: {
|
|
7
6
|
language: Language;
|
|
8
7
|
request: NextRequest;
|
|
8
|
+
response: NextResponse;
|
|
9
9
|
auth0Instance: Auth0Client;
|
|
10
10
|
auth0Config: Auth0Config;
|
|
11
|
-
|
|
11
|
+
onError?: (error: Error) => void;
|
|
12
|
+
}) => Promise<NextResponse | void>;
|
|
@@ -1,12 +1,24 @@
|
|
|
1
1
|
import { NextResponse } from 'next/server';
|
|
2
|
+
import { AccessTokenErrorCode } from '@auth0/nextjs-auth0/errors';
|
|
2
3
|
import { getLoginLink } from '../../lib/authLinks.js';
|
|
4
|
+
import { combineHeaders } from './combineHeaders.js';
|
|
3
5
|
|
|
4
|
-
const
|
|
6
|
+
const handleAccessTokenRequest = async ({ language, request, response, auth0Instance, auth0Config, onError, }) => {
|
|
5
7
|
if (request.nextUrl.pathname !== auth0Config.tokenEndpoint)
|
|
6
8
|
return;
|
|
7
9
|
const searchParams = new URLSearchParams(request.nextUrl.search);
|
|
8
10
|
const sellerId = searchParams.get('seller_id');
|
|
9
11
|
const session = await auth0Instance.getSession(request);
|
|
12
|
+
if (!session) {
|
|
13
|
+
return NextResponse.json({
|
|
14
|
+
error: {
|
|
15
|
+
message: 'The user does not have an active session.',
|
|
16
|
+
code: AccessTokenErrorCode.MISSING_SESSION,
|
|
17
|
+
},
|
|
18
|
+
}, {
|
|
19
|
+
status: 401,
|
|
20
|
+
});
|
|
21
|
+
}
|
|
10
22
|
if (sellerId && session?.user) {
|
|
11
23
|
const loginUrl = getLoginLink({
|
|
12
24
|
auth0Config,
|
|
@@ -14,14 +26,40 @@ const switchSelectedSellerId = async ({ language, request, auth0Instance, auth0C
|
|
|
14
26
|
returnTo: auth0Config.tokenEndpoint,
|
|
15
27
|
selectedSellerId: sellerId,
|
|
16
28
|
});
|
|
17
|
-
return {
|
|
18
|
-
|
|
19
|
-
|
|
29
|
+
return NextResponse.redirect(new URL(loginUrl, request.nextUrl.origin), {
|
|
30
|
+
status: 302,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
try {
|
|
34
|
+
const shouldRefresh = (session?.tokenSet.expiresAt || 0) < Date.now() / 1000 + 30;
|
|
35
|
+
const { token, expiresAt } = await auth0Instance.getAccessToken(request, response, {
|
|
36
|
+
refresh: shouldRefresh,
|
|
37
|
+
});
|
|
38
|
+
const tokenResponse = combineHeaders({
|
|
39
|
+
middlewareResponse: NextResponse.json({
|
|
40
|
+
token,
|
|
41
|
+
expiresAt,
|
|
42
|
+
}, {
|
|
43
|
+
headers: request.headers,
|
|
20
44
|
}),
|
|
21
|
-
|
|
22
|
-
};
|
|
45
|
+
authResponse: response,
|
|
46
|
+
});
|
|
47
|
+
tokenResponse.headers.set('Cache-Control', 'private, no-cache, no-store, must-revalidate, max-age=0');
|
|
48
|
+
tokenResponse.headers.set('Pragma', 'no-cache');
|
|
49
|
+
tokenResponse.headers.set('Expires', '0');
|
|
50
|
+
return tokenResponse;
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
const authError = error;
|
|
54
|
+
onError?.(authError);
|
|
55
|
+
return NextResponse.json({
|
|
56
|
+
error: {
|
|
57
|
+
message: authError.message,
|
|
58
|
+
code: authError.code,
|
|
59
|
+
},
|
|
60
|
+
}, { status: 401 });
|
|
23
61
|
}
|
|
24
62
|
};
|
|
25
63
|
|
|
26
|
-
export {
|
|
64
|
+
export { handleAccessTokenRequest };
|
|
27
65
|
//# sourceMappingURL=token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;MAWa,wBAAwB,GAAG,OAAO,EAC7C,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAQR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa;QAAE;IAE5D,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAEhE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,YAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;AACL,gBAAA,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAE,oBAAoB,CAAC,eAAe;AAC3C,aAAA;SACF,EACD;AACE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CACF;IACH;AAEA,IAAA,IAAI,QAAQ,IAAI,OAAO,EAAE,IAAI,EAAE;QAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC;YAC5B,WAAW;YACX,QAAQ;YACR,QAAQ,EAAE,WAAW,CAAC,aAAa;AACnC,YAAA,gBAAgB,EAAE,QAAQ;AAC3B,SAAA,CAAC;AACF,QAAA,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;AACtE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;QACF,MAAM,aAAa,GACjB,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;AAC7D,QAAA,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,cAAc,CAC7D,OAAO,EACP,QAAQ,EACR;AACE,YAAA,OAAO,EAAE,aAAa;AACvB,SAAA,CACF;QAED,MAAM,aAAa,GAAG,cAAc,CAAC;AACnC,YAAA,kBAAkB,EAAE,YAAY,CAAC,IAAI,CACnC;gBACE,KAAK;gBACL,SAAS;aACV,EACD;gBACE,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CACF;AACD,YAAA,YAAY,EAAE,QAAQ;AACvB,SAAA,CAAC;QACF,aAAa,CAAC,OAAO,CAAC,GAAG,CACvB,eAAe,EACf,yDAAyD,CAC1D;QACD,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC/C,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC;AAEzC,QAAA,OAAO,aAAa;IACtB;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;QAEpB,OAAO,YAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;gBACL,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,IAAI,EAAE,SAAS,CAAC,IAAI;AACrB,aAAA;AACF,SAAA,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB;IACH;AACF;;;;"}
|
package/package.json
CHANGED