@smg-automotive/auth 6.4.3-fix-set-legacy-cookies.2 → 6.4.3-lkappler-FED-746-multitenant-seller-id-fallback.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/lib/enrichUser/auth0.js +3 -6
- package/dist/cjs/lib/enrichUser/auth0.js.map +1 -1
- package/dist/cjs/lib/request/getAccessToken.js +2 -10
- package/dist/cjs/lib/request/getAccessToken.js.map +1 -1
- package/dist/cjs/lib/request/sessionCallbackHandler.js +20 -61
- package/dist/cjs/lib/request/sessionCallbackHandler.js.map +1 -1
- package/dist/esm/lib/enrichUser/auth0.js +3 -6
- package/dist/esm/lib/enrichUser/auth0.js.map +1 -1
- package/dist/esm/lib/request/getAccessToken.js +2 -10
- package/dist/esm/lib/request/getAccessToken.js.map +1 -1
- package/dist/esm/lib/request/sessionCallbackHandler.js +20 -61
- package/dist/esm/lib/request/sessionCallbackHandler.js.map +1 -1
- package/package.json +1 -1
|
@@ -19,13 +19,10 @@ var enrichUser = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0
|
|
|
19
19
|
decodedToken = jose.decodeJwt(accessToken);
|
|
20
20
|
isMultiTenantUser = !!decodedToken.isMultiTenantUser;
|
|
21
21
|
forceTenantSelection = isMultiTenantUser && !userHasSelectedSeller;
|
|
22
|
-
sellerId =
|
|
23
|
-
? parseInt(decodedToken.sellerIds[0], 10)
|
|
24
|
-
: null;
|
|
22
|
+
sellerId = parseInt(decodedToken.sellerIds[0], 10);
|
|
25
23
|
commonUser = tslib_es6.__assign(tslib_es6.__assign({}, auth0User), { isImpersonated: !!decodedToken.isImpersonated, userId: decodedToken.user_id.toString(), forceTenantSelection: forceTenantSelection, isMultiTenantUser: isMultiTenantUser });
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
24
|
+
// eslint-disable-next-line no-console
|
|
25
|
+
console.log('[Auth-package] Enriching user with sellerId:', sellerId);
|
|
29
26
|
return [4 /*yield*/, getSeller.getSeller({
|
|
30
27
|
sellerId: Number(sellerId),
|
|
31
28
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sources":["../../../../../src/lib/enrichUser/auth0.ts"],"sourcesContent":[null],"names":["decodeJwt","__assign","getSeller","Auth0UserType"],"mappings":";;;;;;;;AAWO,IAAM,UAAU,GAAG,2EAAO,EAQhC,EAAA;;;QAPC,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,WAAW,GAAA,EAAA,CAAA,WAAA,EACX,6BAA6B,EAA7B,qBAAqB,GAAG,EAAA,KAAA,MAAA,GAAA,KAAK,GAAA,EAAA;;;;gBAM7B,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC;;AAGhE,gBAAA,YAAY,GAAGA,cAAS,CAAkB,WAAW,CAAC;AACtD,gBAAA,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB;AACpD,gBAAA,oBAAoB,GAAG,iBAAiB,IAAI,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"auth0.js","sources":["../../../../../src/lib/enrichUser/auth0.ts"],"sourcesContent":[null],"names":["decodeJwt","__assign","getSeller","Auth0UserType"],"mappings":";;;;;;;;AAWO,IAAM,UAAU,GAAG,2EAAO,EAQhC,EAAA;;;QAPC,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,WAAW,GAAA,EAAA,CAAA,WAAA,EACX,6BAA6B,EAA7B,qBAAqB,GAAG,EAAA,KAAA,MAAA,GAAA,KAAK,GAAA,EAAA;;;;gBAM7B,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC;;AAGhE,gBAAA,YAAY,GAAGA,cAAS,CAAkB,WAAW,CAAC;AACtD,gBAAA,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB;AACpD,gBAAA,oBAAoB,GAAG,iBAAiB,IAAI,CAAC,qBAAqB;AAClE,gBAAA,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAClD,UAAU,GAAAC,kBAAA,CAAAA,kBAAA,CAAA,EAAA,EACX,SAAS,CAAA,EAAA,EACZ,cAAc,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc,EAC7C,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,EACvC,oBAAoB,EAAA,oBAAA,EACpB,iBAAiB,EAAA,iBAAA,EAAA,CAClB;;AAGD,gBAAA,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,QAAQ,CAAC;AAEtD,gBAAA,OAAA,CAAA,CAAA,YAAMC,mBAAS,CAAC;AAC7B,wBAAA,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;AAC3B,qBAAA,CAAC,CAAA;;AAFI,gBAAA,MAAM,GAAG,EAEb,CAAA,IAAA,EAAA;gBAEF,IAAI,CAAC,MAAM,EAAE;;AAEX,oBAAA,OAAO,CAAC,IAAI,CACV,4DAAqD,QAAQ,CAAE,CAChE;;gBAGG,YAAY,GAAAD,kBAAA,CAAAA,kBAAA,CAAA,EAAA,EACb,UAAU,CAAA,EAAA,EACb,QAAQ,EAAE,MAAA,MAAM,KAAA,IAAA,IAAN,MAAM,KAAA,MAAA,GAAA,MAAA,GAAN,MAAM,CAAE,IAAI,MAAI,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAAE,kBAAa,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAA,CAC9B;AACD,gBAAA,OAAA,CAAA,CAAA,aAAO,YAAY,CAAC;;;;;;;"}
|
|
@@ -1,23 +1,15 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
|
|
4
|
-
var jose = require('jose');
|
|
5
4
|
var sessionCallbackHandler = require('./sessionCallbackHandler.js');
|
|
6
5
|
var inFlightAccessTokenCache = require('./inFlightAccessTokenCache.js');
|
|
7
6
|
|
|
8
7
|
var determineSellerIdWithFallbacks = function (_a) {
|
|
9
|
-
var sellerIdFromOptions = _a.sellerIdFromOptions, user = _a.user
|
|
8
|
+
var sellerIdFromOptions = _a.sellerIdFromOptions, user = _a.user;
|
|
10
9
|
if (sellerIdFromOptions)
|
|
11
10
|
return sellerIdFromOptions;
|
|
12
11
|
if (user.sellerId)
|
|
13
12
|
return user.sellerId;
|
|
14
|
-
if (user.forceTenantSelection) {
|
|
15
|
-
var decodedToken = jose.decodeJwt(accessToken);
|
|
16
|
-
var fallback = decodedToken.sellerIds[0];
|
|
17
|
-
// eslint-disable-next-line no-console
|
|
18
|
-
console.info("[Auth-package] Adding fallback seller id ".concat(fallback, " for user ").concat(user.userId, " which has not selected a seller yet"));
|
|
19
|
-
return fallback;
|
|
20
|
-
}
|
|
21
13
|
return null;
|
|
22
14
|
};
|
|
23
15
|
var cacheReleaseDelay = 2000; // 2 seconds
|
|
@@ -113,7 +105,7 @@ var getAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
113
105
|
sellerId = determineSellerIdWithFallbacks({
|
|
114
106
|
sellerIdFromOptions: sellerIdFromOptions,
|
|
115
107
|
user: session.user,
|
|
116
|
-
accessToken: session.accessToken,
|
|
108
|
+
// accessToken: session.accessToken,
|
|
117
109
|
});
|
|
118
110
|
if (!sellerId) {
|
|
119
111
|
throw new Error("Missing seller id for user ".concat(session === null || session === void 0 ? void 0 : session.user.userId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":["
|
|
1
|
+
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":["inFlightTokenRequests","__awaiter","sessionCallbackHandler","__spreadArray"],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var auth0 = require('../../config/auth0.js');
|
|
|
5
5
|
var auth0$1 = require('../enrichUser/auth0.js');
|
|
6
6
|
|
|
7
7
|
var setCookie = function (_a) {
|
|
8
|
-
var auth0Config = _a.auth0Config, value = _a.value, identifier = _a.identifier;
|
|
8
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value, identifier = _a.identifier;
|
|
9
9
|
var cookieValue = "".concat(auth0Config[identifier].name, "=").concat(value);
|
|
10
10
|
var cookieOptions = [
|
|
11
11
|
"HttpOnly=".concat(auth0Config[identifier].httpOnly),
|
|
@@ -16,88 +16,47 @@ var setCookie = function (_a) {
|
|
|
16
16
|
if (auth0Config[identifier].secure) {
|
|
17
17
|
cookieOptions.push('Secure');
|
|
18
18
|
}
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
var getLegacyCookieMaxAge = function (identifier) {
|
|
22
|
-
switch (identifier) {
|
|
23
|
-
case 'legacyAccessTokenName':
|
|
24
|
-
return 1 * 60 * 60;
|
|
25
|
-
case 'legacyRefreshTokenName':
|
|
26
|
-
return 30 * 24 * 60 * 60;
|
|
27
|
-
}
|
|
28
|
-
};
|
|
29
|
-
var setLegacyCookie = function (_a) {
|
|
30
|
-
var auth0Config = _a.auth0Config, value = _a.value, identifier = _a.identifier;
|
|
31
|
-
var cookieName = auth0Config[identifier];
|
|
32
|
-
if (!cookieName) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
var maxAge = getLegacyCookieMaxAge(identifier);
|
|
36
|
-
var cookieValue = "".concat(cookieName, "=").concat(value);
|
|
37
|
-
var cookieOptions = [
|
|
38
|
-
"HttpOnly=true",
|
|
39
|
-
"Max-Age=".concat(maxAge),
|
|
40
|
-
"SameSite=Lax",
|
|
41
|
-
"Path=/",
|
|
42
|
-
'Secure',
|
|
43
|
-
];
|
|
44
|
-
return "".concat(cookieValue, "; ").concat(cookieOptions.join('; '));
|
|
19
|
+
res.setHeader('Set-Cookie', "".concat(cookieValue, "; ").concat(cookieOptions.join('; ')));
|
|
45
20
|
};
|
|
46
21
|
var setSelectedSellerIdCookie = function (_a) {
|
|
47
|
-
var auth0Config = _a.auth0Config, value = _a.value;
|
|
22
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value;
|
|
48
23
|
return setCookie({
|
|
49
24
|
auth0Config: auth0Config,
|
|
25
|
+
res: res,
|
|
50
26
|
value: value,
|
|
51
27
|
identifier: 'selectedSellerIdCookie',
|
|
52
28
|
});
|
|
53
29
|
};
|
|
54
30
|
var setImpersonatedSellerIdCookie = function (_a) {
|
|
55
|
-
var auth0Config = _a.auth0Config, value = _a.value;
|
|
31
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value;
|
|
56
32
|
return setCookie({
|
|
57
33
|
auth0Config: auth0Config,
|
|
34
|
+
res: res,
|
|
58
35
|
value: value,
|
|
59
36
|
identifier: 'impersonatedSellerIdCookie',
|
|
60
37
|
});
|
|
61
38
|
};
|
|
62
39
|
var sessionCallbackHandler = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
63
|
-
var auth0Config,
|
|
40
|
+
var auth0Config, enrichedUser;
|
|
64
41
|
var _c;
|
|
65
42
|
var res = _b.res, session = _b.session, selectedSellerId = _b.selectedSellerId, impersonatedSellerId = _b.impersonatedSellerId, isProxied = _b.isProxied;
|
|
66
43
|
return tslib_es6.__generator(this, function (_d) {
|
|
67
44
|
switch (_d.label) {
|
|
68
45
|
case 0:
|
|
69
46
|
auth0Config = auth0.getAuth0Config({ isProxied: isProxied });
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
identifier: 'legacyRefreshTokenName',
|
|
84
|
-
})
|
|
85
|
-
: null,
|
|
86
|
-
selectedSellerId
|
|
87
|
-
? setSelectedSellerIdCookie({
|
|
88
|
-
auth0Config: auth0Config,
|
|
89
|
-
value: selectedSellerId,
|
|
90
|
-
})
|
|
91
|
-
: null,
|
|
92
|
-
impersonatedSellerId
|
|
93
|
-
? setImpersonatedSellerIdCookie({
|
|
94
|
-
auth0Config: auth0Config,
|
|
95
|
-
value: impersonatedSellerId,
|
|
96
|
-
})
|
|
97
|
-
: null,
|
|
98
|
-
].filter(Boolean);
|
|
99
|
-
if (cookiesToSet.length > 0) {
|
|
100
|
-
res.setHeader('Set-Cookie', cookiesToSet);
|
|
47
|
+
if (selectedSellerId) {
|
|
48
|
+
setSelectedSellerIdCookie({
|
|
49
|
+
auth0Config: auth0Config,
|
|
50
|
+
res: res,
|
|
51
|
+
value: selectedSellerId,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
if (impersonatedSellerId) {
|
|
55
|
+
setImpersonatedSellerIdCookie({
|
|
56
|
+
auth0Config: auth0Config,
|
|
57
|
+
res: res,
|
|
58
|
+
value: impersonatedSellerId,
|
|
59
|
+
});
|
|
101
60
|
}
|
|
102
61
|
return [4 /*yield*/, auth0$1.enrichUser({
|
|
103
62
|
accessToken: (_c = session.accessToken) !== null && _c !== void 0 ? _c : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionCallbackHandler.js","sources":["../../../../../src/lib/request/sessionCallbackHandler.ts"],"sourcesContent":[null],"names":["getAuth0Config","enrichUser","__assign"],"mappings":";;;;;;AAUA,IAAM,SAAS,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"sessionCallbackHandler.js","sources":["../../../../../src/lib/request/sessionCallbackHandler.ts"],"sourcesContent":[null],"names":["getAuth0Config","enrichUser","__assign"],"mappings":"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"}
|
|
@@ -17,13 +17,10 @@ var enrichUser = function (_a) { return __awaiter(void 0, [_a], void 0, function
|
|
|
17
17
|
decodedToken = decodeJwt(accessToken);
|
|
18
18
|
isMultiTenantUser = !!decodedToken.isMultiTenantUser;
|
|
19
19
|
forceTenantSelection = isMultiTenantUser && !userHasSelectedSeller;
|
|
20
|
-
sellerId =
|
|
21
|
-
? parseInt(decodedToken.sellerIds[0], 10)
|
|
22
|
-
: null;
|
|
20
|
+
sellerId = parseInt(decodedToken.sellerIds[0], 10);
|
|
23
21
|
commonUser = __assign(__assign({}, auth0User), { isImpersonated: !!decodedToken.isImpersonated, userId: decodedToken.user_id.toString(), forceTenantSelection: forceTenantSelection, isMultiTenantUser: isMultiTenantUser });
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
22
|
+
// eslint-disable-next-line no-console
|
|
23
|
+
console.log('[Auth-package] Enriching user with sellerId:', sellerId);
|
|
27
24
|
return [4 /*yield*/, getSeller({
|
|
28
25
|
sellerId: Number(sellerId),
|
|
29
26
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sources":["../../../../../src/lib/enrichUser/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAWO,IAAM,UAAU,GAAG,iEAAO,EAQhC,EAAA;;;QAPC,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,WAAW,GAAA,EAAA,CAAA,WAAA,EACX,6BAA6B,EAA7B,qBAAqB,GAAG,EAAA,KAAA,MAAA,GAAA,KAAK,GAAA,EAAA;;;;gBAM7B,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC;;AAGhE,gBAAA,YAAY,GAAG,SAAS,CAAkB,WAAW,CAAC;AACtD,gBAAA,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB;AACpD,gBAAA,oBAAoB,GAAG,iBAAiB,IAAI,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"auth0.js","sources":["../../../../../src/lib/enrichUser/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAWO,IAAM,UAAU,GAAG,iEAAO,EAQhC,EAAA;;;QAPC,SAAS,GAAA,EAAA,CAAA,SAAA,EACT,WAAW,GAAA,EAAA,CAAA,WAAA,EACX,6BAA6B,EAA7B,qBAAqB,GAAG,EAAA,KAAA,MAAA,GAAA,KAAK,GAAA,EAAA;;;;gBAM7B,IAAI,CAAC,WAAW,EAAE;AAChB,oBAAA,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC;;AAGhE,gBAAA,YAAY,GAAG,SAAS,CAAkB,WAAW,CAAC;AACtD,gBAAA,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB;AACpD,gBAAA,oBAAoB,GAAG,iBAAiB,IAAI,CAAC,qBAAqB;AAClE,gBAAA,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAClD,UAAU,GAAA,QAAA,CAAA,QAAA,CAAA,EAAA,EACX,SAAS,CAAA,EAAA,EACZ,cAAc,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc,EAC7C,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,EACvC,oBAAoB,EAAA,oBAAA,EACpB,iBAAiB,EAAA,iBAAA,EAAA,CAClB;;AAGD,gBAAA,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,QAAQ,CAAC;AAEtD,gBAAA,OAAA,CAAA,CAAA,YAAM,SAAS,CAAC;AAC7B,wBAAA,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;AAC3B,qBAAA,CAAC,CAAA;;AAFI,gBAAA,MAAM,GAAG,EAEb,CAAA,IAAA,EAAA;gBAEF,IAAI,CAAC,MAAM,EAAE;;AAEX,oBAAA,OAAO,CAAC,IAAI,CACV,4DAAqD,QAAQ,CAAE,CAChE;;gBAGG,YAAY,GAAA,QAAA,CAAA,QAAA,CAAA,EAAA,EACb,UAAU,CAAA,EAAA,EACb,QAAQ,EAAE,MAAA,MAAM,KAAA,IAAA,IAAN,MAAM,KAAA,MAAA,GAAA,MAAA,GAAN,MAAM,CAAE,IAAI,MAAI,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAA,aAAa,CAAC,OAAO,EAC/C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAA,CAC9B;AACD,gBAAA,OAAA,CAAA,CAAA,aAAO,YAAY,CAAC;;;;;;;"}
|
|
@@ -1,21 +1,13 @@
|
|
|
1
1
|
import { __awaiter, __generator, __spreadArray } from '../../node_modules/tslib/tslib.es6.js';
|
|
2
|
-
import { decodeJwt } from 'jose';
|
|
3
2
|
import { sessionCallbackHandler } from './sessionCallbackHandler.js';
|
|
4
3
|
import { inFlightTokenRequests } from './inFlightAccessTokenCache.js';
|
|
5
4
|
|
|
6
5
|
var determineSellerIdWithFallbacks = function (_a) {
|
|
7
|
-
var sellerIdFromOptions = _a.sellerIdFromOptions, user = _a.user
|
|
6
|
+
var sellerIdFromOptions = _a.sellerIdFromOptions, user = _a.user;
|
|
8
7
|
if (sellerIdFromOptions)
|
|
9
8
|
return sellerIdFromOptions;
|
|
10
9
|
if (user.sellerId)
|
|
11
10
|
return user.sellerId;
|
|
12
|
-
if (user.forceTenantSelection) {
|
|
13
|
-
var decodedToken = decodeJwt(accessToken);
|
|
14
|
-
var fallback = decodedToken.sellerIds[0];
|
|
15
|
-
// eslint-disable-next-line no-console
|
|
16
|
-
console.info("[Auth-package] Adding fallback seller id ".concat(fallback, " for user ").concat(user.userId, " which has not selected a seller yet"));
|
|
17
|
-
return fallback;
|
|
18
|
-
}
|
|
19
11
|
return null;
|
|
20
12
|
};
|
|
21
13
|
var cacheReleaseDelay = 2000; // 2 seconds
|
|
@@ -111,7 +103,7 @@ var getAccessToken = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
111
103
|
sellerId = determineSellerIdWithFallbacks({
|
|
112
104
|
sellerIdFromOptions: sellerIdFromOptions,
|
|
113
105
|
user: session.user,
|
|
114
|
-
accessToken: session.accessToken,
|
|
106
|
+
// accessToken: session.accessToken,
|
|
115
107
|
});
|
|
116
108
|
if (!sellerId) {
|
|
117
109
|
throw new Error("Missing seller id for user ".concat(session === null || session === void 0 ? void 0 : session.user.userId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AA+CA,IAAM,8BAA8B,GAAG,UAAC,EAMvC,EAAA;QALC,mBAAmB,GAAA,EAAA,CAAA,mBAAA,EACnB,IAAI,GAAA,EAAA,CAAA,IAAA;AAKJ,IAAA,IAAI,mBAAmB;AAAE,QAAA,OAAO,mBAAmB;IACnD,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC,QAAQ;AAEvC,IAAA,OAAO,IAAI;AACb,CAAC;AAED,IAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,IAAM,mBAAmB,GAAG,UAAC,GAAW,EAAA;IACtC,IAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;AAC9C,IAAA,IAAI,CAAC,OAAO;QAAE;AAEd,IAAA,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,KAAK,CACX,kBAAmB,CAAA,MAAA,CAAA,GAAG,EAA8B,kCAAA,CAAA,CAAA,MAAA,CAAA,OAAO,CAAC,KAAK,CAAE,CACpE;AACD,QAAA,UAAU,CAAC,YAAA,EAAM,OAAA,mBAAmB,CAAC,GAAG,CAAC,CAAA,EAAA,EAAE,GAAG,CAAC;QAC/C;;AAGF,IAAA,IAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;AACtB,IAAA,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,GAAG,GAAG;AAErC,IAAA,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,CAAC,KAAK,CACX,kBAAA,CAAA,MAAA,CAAmB,GAAG,EAA+B,8BAAA,CAAA,CAAA,MAAA,CAAA,KAAK,EAAI,IAAA,CAAA,CAC/D;AACD,QAAA,UAAU,CAAC,YAAA,EAAM,OAAA,mBAAmB,CAAC,GAAG,CAAC,CAAA,EAAA,EAAE,KAAK,CAAC;QACjD;;AAGF,IAAA,OAAO,CAAC,KAAK,CAAC,0BAAmB,GAAG,EAAA,mCAAA,CAAmC,CAAC;AACxE,IAAA,UAAU,CAAC,YAAA;AACT,QAAA,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC;QACjC,OAAO,CAAC,KAAK,CACX,kBAAA,CAAA,MAAA,CAAmB,GAAG,EAAsC,qCAAA,CAAA,CAAA,MAAA,CAAA,iBAAiB,EAAI,IAAA,CAAA,CAClF;KACF,EAAE,iBAAiB,CAAC;AACvB,CAAC;AAED,IAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,IAAM,sBAAsB,GAAG,UAC7B,GAAW,EACX,aAA4B,EAC5B,eAA2C,EAAA;AAE3C,IAAA,OAAO,CAAC,KAAK,CACX,kDAAA,CAAA,MAAA,CAAmD,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAE,CAC9E;IAED,IAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;IAC/C,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,KAAK,EAAE;QAChB,OAAO,CAAC,KAAK,CACX,kBAAmB,CAAA,MAAA,CAAA,GAAG,EAA2C,0CAAA,CAAA,CAAA,MAAA,CAAA,QAAQ,CAAC,KAAK,CAAE,CAClF;AAED,QAAA,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,YAAA;YAC9B,QAAQ,CAAC,KAAK,EAAE;YAChB,OAAO,CAAC,KAAK,CACX,mCAAoC,CAAA,MAAA,CAAA,GAAG,EAA8C,6CAAA,CAAA,CAAA,MAAA,CAAA,QAAQ,CAAC,KAAK,CAAE,CACtG;AAED,YAAA,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,EAAE;gBACxB,mBAAmB,CAAC,GAAG,CAAC;;AAE5B,SAAC,CAAC;;;AAIJ,IAAA,IAAI,OAA4C;AAChD,IAAA,IAAI,MAA8B;IAClC,IAAM,cAAc,GAAG,IAAI,OAAO,CAAuB,UAAC,GAAG,EAAE,GAAG,EAAA;QAChE,OAAO,GAAG,GAAG;QACb,MAAM,GAAG,GAAG;AACd,KAAC,CAAC;AAEF,IAAA,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE;AAC7B,QAAA,OAAO,EAAE,cAAc;AACvB,QAAA,KAAK,EAAE,CAAC;QACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,mBAAmB;AAC5C,KAAA,CAAC;AACF,IAAA,OAAO,CAAC,KAAK,CAAC,0BAAmB,GAAG,EAAA,sCAAA,CAAsC,CAAC;IAE3E;SACG,cAAc,CAAA,KAAA,CADjB,aAAa,EACQ,eAAe,EACjC,IAAI,CAAC,UAAC,MAAM,EAAA;AACX,QAAA,OAAO,CAAC,KAAK,CACX,0BAAmB,GAAG,EAAA,4CAAA,CAAuC,CAC9D;QACD,OAAO,CAAC,MAAM,CAAC;AACjB,KAAC;SACA,KAAK,CAAC,UAAC,GAAG,EAAA;QACT,OAAO,CAAC,KAAK,CAAC,kBAAA,CAAA,MAAA,CAAmB,GAAG,EAAgB,gBAAA,CAAA,EAAE,GAAG,CAAC;AAC1D,QAAA,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC;AACb,KAAC;AACA,SAAA,OAAO,CAAC,YAAA;QACP,IAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;QAC9C,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,KAAK,EAAE;YACf,OAAO,CAAC,KAAK,CACX,mCAAoC,CAAA,MAAA,CAAA,GAAG,EAAuC,2CAAA,CAAA,CAAA,MAAA,CAAA,OAAO,CAAC,KAAK,CAAE,CAC9F;AACD,YAAA,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE;gBACvB,mBAAmB,CAAC,GAAG,CAAC;;;AAG9B,KAAC,CAAC;AAEJ,IAAA,OAAO,cAAc;AACvB,CAAC;AAEM,IAAM,cAAc,GAAG,iEAAO,EAKhB,EAAA;;AAJnB,IAAA,IAAA,aAAa,GAAA,EAAA,CAAA,aAAA,EACb,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,EAAA,GAAA,EAAA,CAAA,OAAY,EAAZ,OAAO,GAAG,EAAA,KAAA,MAAA,GAAA,EAAE,GAAA,EAAA,EACZ,SAAS,GAAA,EAAA,CAAA,SAAA;;;;AAEH,gBAAA,WAAW,GAA2B;sBACvC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ;sBACnC,EAAE;AACU,gBAAA,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,OAAxB,aAAa,EAAe,WAAW,CAAC,CAAA;;AAAxD,gBAAA,OAAO,GAAG,EAA8C,CAAA,IAAA,EAAA;AAE9D,gBAAA,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;AACrD,oBAAA,OAAA,CAAA,CAAA,aAAO,IAAI,CAAC;;gBAGd,OAAO,CAAC,KAAK,CACX,gDAAA,CAAA,MAAA,CAAiD,OAAO,KAAP,IAAA,IAAA,OAAO,KAAP,MAAA,GAAA,MAAA,GAAA,OAAO,CAAE,IAAI,CAAC,MAAM,EAAA,MAAA,CAAA,CAAA,MAAA,CAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAE,CACvG;gBAEK,mBAAmB,GAAG,CAAA,OAAO,KAAP,IAAA,IAAA,OAAO,KAAP,MAAA,GAAA,MAAA,GAAA,OAAO,CAAE,QAAQ,KAAI,IAAI;gBAC/C,QAAQ,GAAG,8BAA8B,CAAC;AAC9C,oBAAA,mBAAmB,EAAA,mBAAA;oBACnB,IAAI,EAAE,OAAO,CAAC,IAAmB;;AAElC,iBAAA,CAAC;gBACF,IAAI,CAAC,QAAQ,EAAE;AACb,oBAAA,MAAM,IAAI,KAAK,CAAC,6BAAA,CAAA,MAAA,CAA8B,OAAO,KAAP,IAAA,IAAA,OAAO,KAAP,MAAA,GAAA,MAAA,GAAA,OAAO,CAAE,IAAI,CAAC,MAAM,CAAE,CAAC;;gBAGjE,OAAO,GAAG,CAAA,OAAO,KAAP,IAAA,IAAA,OAAO,KAAP,MAAA,GAAA,MAAA,GAAA,OAAO,CAAE,OAAO,KAAI,KAAK;AACnC,gBAAA,kBAAkB,GAAuB;AAC7C,oBAAA,OAAO,EAAA,OAAA;AACP,oBAAA,mBAAmB,EAAE;AACnB,wBAAA,SAAS,EAAE,QAAQ;AACpB,qBAAA;AACD,oBAAA,YAAY,EAAE,UACZ,IAAsC,EACtC,GAAqC,EACrC,cAAuB,EAAA,EAAA,OAAA,SAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,YAAA;;AAEvB,4BAAA,OAAA,CAAA,CAAA,aAAO,sBAAsB,CAAC;AAC5B,oCAAA,GAAG,EAAA,GAAA;AACH,oCAAA,OAAO,EAAE,cAAc;AACvB,oCAAA,gBAAgB,EAAE,QAAQ;AAC1B,oCAAA,oBAAoB,EAAE,IAAI;AAC1B,oCAAA,SAAS,EAAA,SAAA;AACV,iCAAA,CAAC,CAAC;;AACJ,qBAAA,CAAA,CAAA,EAAA;iBACF;AACK,gBAAA,eAAe,GAA+B;sBACjD,aAAA,CAAA,aAAA,CAAA,EAAA,EAAK,WAAW,EAAA,IAAA,CAAA,EAAA,CAAE,kBAAkB,CAAA,EAAA,KAAA,CAAA,GACnC,CAAC,kBAAkB,CAAC;AAExB,gBAAA,OAAO,CAAC,KAAK,CAAC,iDAAiD,EAAE;oBAC/D,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;AACpD,oBAAA,OAAO,EAAA,OAAA;AACR,iBAAA,CAAC;gBACsB,OAAM,CAAA,CAAA,YAAA,sBAAsB,CAClD,EAAG,CAAA,MAAA,CAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,IAAI,CAAC,MAAM,EAAA,GAAA,CAAA,CAAA,MAAA,CAAI,QAAQ,CAAE,EACrC,aAAa,EACb,eAAe,CAChB,CAAA;;AAJO,gBAAA,WAAW,GAAK,CAAA,EAIvB,CAAA,IAAA,EAAA,EAJkB,WAAA;AAMnB,gBAAA,OAAA,CAAA,CAAA,aAAO,WAAW,KAAX,IAAA,IAAA,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC;;;;;;;"}
|
|
@@ -3,7 +3,7 @@ import { getAuth0Config } from '../../config/auth0.js';
|
|
|
3
3
|
import { enrichUser } from '../enrichUser/auth0.js';
|
|
4
4
|
|
|
5
5
|
var setCookie = function (_a) {
|
|
6
|
-
var auth0Config = _a.auth0Config, value = _a.value, identifier = _a.identifier;
|
|
6
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value, identifier = _a.identifier;
|
|
7
7
|
var cookieValue = "".concat(auth0Config[identifier].name, "=").concat(value);
|
|
8
8
|
var cookieOptions = [
|
|
9
9
|
"HttpOnly=".concat(auth0Config[identifier].httpOnly),
|
|
@@ -14,88 +14,47 @@ var setCookie = function (_a) {
|
|
|
14
14
|
if (auth0Config[identifier].secure) {
|
|
15
15
|
cookieOptions.push('Secure');
|
|
16
16
|
}
|
|
17
|
-
|
|
18
|
-
};
|
|
19
|
-
var getLegacyCookieMaxAge = function (identifier) {
|
|
20
|
-
switch (identifier) {
|
|
21
|
-
case 'legacyAccessTokenName':
|
|
22
|
-
return 1 * 60 * 60;
|
|
23
|
-
case 'legacyRefreshTokenName':
|
|
24
|
-
return 30 * 24 * 60 * 60;
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
var setLegacyCookie = function (_a) {
|
|
28
|
-
var auth0Config = _a.auth0Config, value = _a.value, identifier = _a.identifier;
|
|
29
|
-
var cookieName = auth0Config[identifier];
|
|
30
|
-
if (!cookieName) {
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
var maxAge = getLegacyCookieMaxAge(identifier);
|
|
34
|
-
var cookieValue = "".concat(cookieName, "=").concat(value);
|
|
35
|
-
var cookieOptions = [
|
|
36
|
-
"HttpOnly=true",
|
|
37
|
-
"Max-Age=".concat(maxAge),
|
|
38
|
-
"SameSite=Lax",
|
|
39
|
-
"Path=/",
|
|
40
|
-
'Secure',
|
|
41
|
-
];
|
|
42
|
-
return "".concat(cookieValue, "; ").concat(cookieOptions.join('; '));
|
|
17
|
+
res.setHeader('Set-Cookie', "".concat(cookieValue, "; ").concat(cookieOptions.join('; ')));
|
|
43
18
|
};
|
|
44
19
|
var setSelectedSellerIdCookie = function (_a) {
|
|
45
|
-
var auth0Config = _a.auth0Config, value = _a.value;
|
|
20
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value;
|
|
46
21
|
return setCookie({
|
|
47
22
|
auth0Config: auth0Config,
|
|
23
|
+
res: res,
|
|
48
24
|
value: value,
|
|
49
25
|
identifier: 'selectedSellerIdCookie',
|
|
50
26
|
});
|
|
51
27
|
};
|
|
52
28
|
var setImpersonatedSellerIdCookie = function (_a) {
|
|
53
|
-
var auth0Config = _a.auth0Config, value = _a.value;
|
|
29
|
+
var auth0Config = _a.auth0Config, res = _a.res, value = _a.value;
|
|
54
30
|
return setCookie({
|
|
55
31
|
auth0Config: auth0Config,
|
|
32
|
+
res: res,
|
|
56
33
|
value: value,
|
|
57
34
|
identifier: 'impersonatedSellerIdCookie',
|
|
58
35
|
});
|
|
59
36
|
};
|
|
60
37
|
var sessionCallbackHandler = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
61
|
-
var auth0Config,
|
|
38
|
+
var auth0Config, enrichedUser;
|
|
62
39
|
var _c;
|
|
63
40
|
var res = _b.res, session = _b.session, selectedSellerId = _b.selectedSellerId, impersonatedSellerId = _b.impersonatedSellerId, isProxied = _b.isProxied;
|
|
64
41
|
return __generator(this, function (_d) {
|
|
65
42
|
switch (_d.label) {
|
|
66
43
|
case 0:
|
|
67
44
|
auth0Config = getAuth0Config({ isProxied: isProxied });
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
identifier: 'legacyRefreshTokenName',
|
|
82
|
-
})
|
|
83
|
-
: null,
|
|
84
|
-
selectedSellerId
|
|
85
|
-
? setSelectedSellerIdCookie({
|
|
86
|
-
auth0Config: auth0Config,
|
|
87
|
-
value: selectedSellerId,
|
|
88
|
-
})
|
|
89
|
-
: null,
|
|
90
|
-
impersonatedSellerId
|
|
91
|
-
? setImpersonatedSellerIdCookie({
|
|
92
|
-
auth0Config: auth0Config,
|
|
93
|
-
value: impersonatedSellerId,
|
|
94
|
-
})
|
|
95
|
-
: null,
|
|
96
|
-
].filter(Boolean);
|
|
97
|
-
if (cookiesToSet.length > 0) {
|
|
98
|
-
res.setHeader('Set-Cookie', cookiesToSet);
|
|
45
|
+
if (selectedSellerId) {
|
|
46
|
+
setSelectedSellerIdCookie({
|
|
47
|
+
auth0Config: auth0Config,
|
|
48
|
+
res: res,
|
|
49
|
+
value: selectedSellerId,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
if (impersonatedSellerId) {
|
|
53
|
+
setImpersonatedSellerIdCookie({
|
|
54
|
+
auth0Config: auth0Config,
|
|
55
|
+
res: res,
|
|
56
|
+
value: impersonatedSellerId,
|
|
57
|
+
});
|
|
99
58
|
}
|
|
100
59
|
return [4 /*yield*/, enrichUser({
|
|
101
60
|
accessToken: (_c = session.accessToken) !== null && _c !== void 0 ? _c : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionCallbackHandler.js","sources":["../../../../../src/lib/request/sessionCallbackHandler.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,IAAM,SAAS,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"sessionCallbackHandler.js","sources":["../../../../../src/lib/request/sessionCallbackHandler.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|