@smg-automotive/auth 6.6.0-lkappeler-fix-multitenant-selection-caching.2 → 6.6.0
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.
|
@@ -18,26 +18,33 @@ var safeCleanupAfterTTL = function (key) {
|
|
|
18
18
|
if (!tracked)
|
|
19
19
|
return;
|
|
20
20
|
if (tracked.count > 0) {
|
|
21
|
+
console.debug("[Auth-package] [".concat(key, "] cleanup deferred \u2014 count=").concat(tracked.count));
|
|
21
22
|
setTimeout(function () { return safeCleanupAfterTTL(key); }, 500);
|
|
22
23
|
return;
|
|
23
24
|
}
|
|
24
25
|
var now = Date.now();
|
|
25
26
|
var delay = tracked.expiresAt - now;
|
|
26
27
|
if (delay > 0) {
|
|
28
|
+
console.debug("[Auth-package] [".concat(key, "] delaying final cleanup by ").concat(delay, "ms"));
|
|
27
29
|
setTimeout(function () { return safeCleanupAfterTTL(key); }, delay);
|
|
28
30
|
return;
|
|
29
31
|
}
|
|
32
|
+
console.debug("[Auth-package] [".concat(key, "] cache expired scheduling delete"));
|
|
30
33
|
setTimeout(function () {
|
|
31
34
|
inFlightAccessTokenCache.inFlightTokenRequests.delete(key);
|
|
35
|
+
console.debug("[Auth-package] [".concat(key, "] cache expired, cleaning up after ").concat(cacheReleaseDelay, "ms"));
|
|
32
36
|
}, cacheReleaseDelay);
|
|
33
37
|
};
|
|
34
38
|
var accessTokenCacheTTL = 10000; // 10 seconds
|
|
35
39
|
var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
40
|
+
console.debug("[Auth-package] getAccessTokenWithLock called at ".concat(new Date().toISOString()));
|
|
36
41
|
var existing = inFlightAccessTokenCache.inFlightTokenRequests.get(key);
|
|
37
42
|
if (existing) {
|
|
38
43
|
existing.count++;
|
|
44
|
+
console.debug("[Auth-package] [".concat(key, "] found in cache, incrementing count to ").concat(existing.count));
|
|
39
45
|
return existing.promise.finally(function () {
|
|
40
46
|
existing.count--;
|
|
47
|
+
console.debug("[Auth-package] existing finally [".concat(key, "] consumer finished, decrementing count to ").concat(existing.count));
|
|
41
48
|
if (existing.count === 0) {
|
|
42
49
|
safeCleanupAfterTTL(key);
|
|
43
50
|
}
|
|
@@ -55,11 +62,14 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
55
62
|
count: 1,
|
|
56
63
|
expiresAt: Date.now() + accessTokenCacheTTL, // TTL in ms
|
|
57
64
|
});
|
|
65
|
+
console.debug("[Auth-package] [".concat(key, "] not in cache, creating new promise"));
|
|
58
66
|
auth0Instance
|
|
59
67
|
.getAccessToken.apply(auth0Instance, accessTokenArgs).then(function (result) {
|
|
68
|
+
console.debug("[Auth-package] [".concat(key, "] initial consumer finished \u2014 count=1"));
|
|
60
69
|
resolve(result);
|
|
61
70
|
})
|
|
62
71
|
.catch(function (err) {
|
|
72
|
+
console.error("[Auth-package] [".concat(key, "] Auth0 error:"), err);
|
|
63
73
|
inFlightAccessTokenCache.inFlightTokenRequests.delete(key);
|
|
64
74
|
reject(err);
|
|
65
75
|
})
|
|
@@ -67,6 +77,7 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
67
77
|
var tracked = inFlightAccessTokenCache.inFlightTokenRequests.get(key);
|
|
68
78
|
if (tracked) {
|
|
69
79
|
tracked.count--;
|
|
80
|
+
console.debug("[Auth-package] original finally [".concat(key, "] initial consumer finished \u2014 count=").concat(tracked.count));
|
|
70
81
|
if (tracked.count === 0) {
|
|
71
82
|
safeCleanupAfterTTL(key);
|
|
72
83
|
}
|
|
@@ -75,7 +86,7 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
75
86
|
return wrapperPromise;
|
|
76
87
|
};
|
|
77
88
|
var getAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
78
|
-
var flatContext, session, sellerIdFromOptions, sellerId, refresh, accessTokenRequest, accessTokenArgs,
|
|
89
|
+
var flatContext, session, sellerIdFromOptions, sellerId, refresh, accessTokenRequest, accessTokenArgs, accessToken;
|
|
79
90
|
var auth0Instance = _b.auth0Instance, context = _b.context, _c = _b.options, options = _c === void 0 ? {} : _c, isProxied = _b.isProxied;
|
|
80
91
|
return tslib_es6.__generator(this, function (_d) {
|
|
81
92
|
switch (_d.label) {
|
|
@@ -89,6 +100,7 @@ var getAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
89
100
|
if (!session || !session.user || !session.accessToken) {
|
|
90
101
|
return [2 /*return*/, null];
|
|
91
102
|
}
|
|
103
|
+
console.debug("[Auth-package] getAccessToken called for user ".concat(session === null || session === void 0 ? void 0 : session.user.userId, " at ").concat(new Date().toISOString()));
|
|
92
104
|
sellerIdFromOptions = (options === null || options === void 0 ? void 0 : options.sellerId) || null;
|
|
93
105
|
sellerId = determineSellerIdWithFallbacks({
|
|
94
106
|
sellerIdFromOptions: sellerIdFromOptions,
|
|
@@ -117,8 +129,12 @@ var getAccessToken = function (_a) { return tslib_es6.__awaiter(void 0, [_a], vo
|
|
|
117
129
|
};
|
|
118
130
|
accessTokenArgs = context
|
|
119
131
|
? tslib_es6.__spreadArray(tslib_es6.__spreadArray([], flatContext, true), [accessTokenRequest], false) : [accessTokenRequest];
|
|
120
|
-
|
|
121
|
-
|
|
132
|
+
console.debug("[Auth-package] calling access token with args:", {
|
|
133
|
+
refreshToken: session.refreshToken,
|
|
134
|
+
refreshTokenExpiresAt: session.refreshTokenExpiresAt,
|
|
135
|
+
refresh: refresh,
|
|
136
|
+
});
|
|
137
|
+
return [4 /*yield*/, getAccessTokenWithLock("".concat(session === null || session === void 0 ? void 0 : session.user.userId, "-").concat(sellerId), auth0Instance, accessTokenArgs)];
|
|
122
138
|
case 2:
|
|
123
139
|
accessToken = (_d.sent()).accessToken;
|
|
124
140
|
return [2 /*return*/, accessToken !== null && accessToken !== void 0 ? accessToken : null];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":["inFlightTokenRequests","__awaiter","sessionCallbackHandler","__spreadArray"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/lib/request/getAccessToken.ts"],"sourcesContent":[null],"names":["inFlightTokenRequests","__awaiter","sessionCallbackHandler","__spreadArray"],"mappings":"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"}
|
|
@@ -16,26 +16,33 @@ var safeCleanupAfterTTL = function (key) {
|
|
|
16
16
|
if (!tracked)
|
|
17
17
|
return;
|
|
18
18
|
if (tracked.count > 0) {
|
|
19
|
+
console.debug("[Auth-package] [".concat(key, "] cleanup deferred \u2014 count=").concat(tracked.count));
|
|
19
20
|
setTimeout(function () { return safeCleanupAfterTTL(key); }, 500);
|
|
20
21
|
return;
|
|
21
22
|
}
|
|
22
23
|
var now = Date.now();
|
|
23
24
|
var delay = tracked.expiresAt - now;
|
|
24
25
|
if (delay > 0) {
|
|
26
|
+
console.debug("[Auth-package] [".concat(key, "] delaying final cleanup by ").concat(delay, "ms"));
|
|
25
27
|
setTimeout(function () { return safeCleanupAfterTTL(key); }, delay);
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
30
|
+
console.debug("[Auth-package] [".concat(key, "] cache expired scheduling delete"));
|
|
28
31
|
setTimeout(function () {
|
|
29
32
|
inFlightTokenRequests.delete(key);
|
|
33
|
+
console.debug("[Auth-package] [".concat(key, "] cache expired, cleaning up after ").concat(cacheReleaseDelay, "ms"));
|
|
30
34
|
}, cacheReleaseDelay);
|
|
31
35
|
};
|
|
32
36
|
var accessTokenCacheTTL = 10000; // 10 seconds
|
|
33
37
|
var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
38
|
+
console.debug("[Auth-package] getAccessTokenWithLock called at ".concat(new Date().toISOString()));
|
|
34
39
|
var existing = inFlightTokenRequests.get(key);
|
|
35
40
|
if (existing) {
|
|
36
41
|
existing.count++;
|
|
42
|
+
console.debug("[Auth-package] [".concat(key, "] found in cache, incrementing count to ").concat(existing.count));
|
|
37
43
|
return existing.promise.finally(function () {
|
|
38
44
|
existing.count--;
|
|
45
|
+
console.debug("[Auth-package] existing finally [".concat(key, "] consumer finished, decrementing count to ").concat(existing.count));
|
|
39
46
|
if (existing.count === 0) {
|
|
40
47
|
safeCleanupAfterTTL(key);
|
|
41
48
|
}
|
|
@@ -53,11 +60,14 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
53
60
|
count: 1,
|
|
54
61
|
expiresAt: Date.now() + accessTokenCacheTTL, // TTL in ms
|
|
55
62
|
});
|
|
63
|
+
console.debug("[Auth-package] [".concat(key, "] not in cache, creating new promise"));
|
|
56
64
|
auth0Instance
|
|
57
65
|
.getAccessToken.apply(auth0Instance, accessTokenArgs).then(function (result) {
|
|
66
|
+
console.debug("[Auth-package] [".concat(key, "] initial consumer finished \u2014 count=1"));
|
|
58
67
|
resolve(result);
|
|
59
68
|
})
|
|
60
69
|
.catch(function (err) {
|
|
70
|
+
console.error("[Auth-package] [".concat(key, "] Auth0 error:"), err);
|
|
61
71
|
inFlightTokenRequests.delete(key);
|
|
62
72
|
reject(err);
|
|
63
73
|
})
|
|
@@ -65,6 +75,7 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
65
75
|
var tracked = inFlightTokenRequests.get(key);
|
|
66
76
|
if (tracked) {
|
|
67
77
|
tracked.count--;
|
|
78
|
+
console.debug("[Auth-package] original finally [".concat(key, "] initial consumer finished \u2014 count=").concat(tracked.count));
|
|
68
79
|
if (tracked.count === 0) {
|
|
69
80
|
safeCleanupAfterTTL(key);
|
|
70
81
|
}
|
|
@@ -73,7 +84,7 @@ var getAccessTokenWithLock = function (key, auth0Instance, accessTokenArgs) {
|
|
|
73
84
|
return wrapperPromise;
|
|
74
85
|
};
|
|
75
86
|
var getAccessToken = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
76
|
-
var flatContext, session, sellerIdFromOptions, sellerId, refresh, accessTokenRequest, accessTokenArgs,
|
|
87
|
+
var flatContext, session, sellerIdFromOptions, sellerId, refresh, accessTokenRequest, accessTokenArgs, accessToken;
|
|
77
88
|
var auth0Instance = _b.auth0Instance, context = _b.context, _c = _b.options, options = _c === void 0 ? {} : _c, isProxied = _b.isProxied;
|
|
78
89
|
return __generator(this, function (_d) {
|
|
79
90
|
switch (_d.label) {
|
|
@@ -87,6 +98,7 @@ var getAccessToken = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
87
98
|
if (!session || !session.user || !session.accessToken) {
|
|
88
99
|
return [2 /*return*/, null];
|
|
89
100
|
}
|
|
101
|
+
console.debug("[Auth-package] getAccessToken called for user ".concat(session === null || session === void 0 ? void 0 : session.user.userId, " at ").concat(new Date().toISOString()));
|
|
90
102
|
sellerIdFromOptions = (options === null || options === void 0 ? void 0 : options.sellerId) || null;
|
|
91
103
|
sellerId = determineSellerIdWithFallbacks({
|
|
92
104
|
sellerIdFromOptions: sellerIdFromOptions,
|
|
@@ -115,8 +127,12 @@ var getAccessToken = function (_a) { return __awaiter(void 0, [_a], void 0, func
|
|
|
115
127
|
};
|
|
116
128
|
accessTokenArgs = context
|
|
117
129
|
? __spreadArray(__spreadArray([], flatContext, true), [accessTokenRequest], false) : [accessTokenRequest];
|
|
118
|
-
|
|
119
|
-
|
|
130
|
+
console.debug("[Auth-package] calling access token with args:", {
|
|
131
|
+
refreshToken: session.refreshToken,
|
|
132
|
+
refreshTokenExpiresAt: session.refreshTokenExpiresAt,
|
|
133
|
+
refresh: refresh,
|
|
134
|
+
});
|
|
135
|
+
return [4 /*yield*/, getAccessTokenWithLock("".concat(session === null || session === void 0 ? void 0 : session.user.userId, "-").concat(sellerId), auth0Instance, accessTokenArgs)];
|
|
120
136
|
case 2:
|
|
121
137
|
accessToken = (_d.sent()).accessToken;
|
|
122
138
|
return [2 /*return*/, accessToken !== null && accessToken !== void 0 ? accessToken : null];
|
|
@@ -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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smg-automotive/auth",
|
|
3
|
-
"version": "6.6.0
|
|
3
|
+
"version": "6.6.0",
|
|
4
4
|
"description": "SMG Automotive auth package",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"dotenv": "17.2.0",
|
|
73
73
|
"jest": "29.7.0",
|
|
74
74
|
"jest-environment-jsdom": "29.7.0",
|
|
75
|
-
"next": "14.2.
|
|
75
|
+
"next": "14.2.30",
|
|
76
76
|
"react": "18.3.1",
|
|
77
77
|
"react-dom": "18.3.1",
|
|
78
78
|
"rimraf": "6.0.1",
|