@feelflow/ffid-sdk 5.24.1 → 5.24.2
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/{chunk-C4RNFEME.js → chunk-Q7ZEF3EN.js} +28 -19
- package/dist/{chunk-L5SBAHY3.cjs → chunk-QMWUOVZK.cjs} +28 -19
- package/dist/components/index.cjs +8 -8
- package/dist/components/index.js +1 -1
- package/dist/index.cjs +42 -42
- package/dist/index.js +2 -2
- package/dist/server/index.cjs +46 -25
- package/dist/server/index.js +46 -25
- package/package.json +1 -1
|
@@ -1227,7 +1227,7 @@ function createNonContractMethods(deps) {
|
|
|
1227
1227
|
}
|
|
1228
1228
|
|
|
1229
1229
|
// src/client/version-check.ts
|
|
1230
|
-
var SDK_VERSION = "5.24.
|
|
1230
|
+
var SDK_VERSION = "5.24.2";
|
|
1231
1231
|
var SDK_USER_AGENT = `FFID-SDK/${SDK_VERSION} (TypeScript)`;
|
|
1232
1232
|
var SDK_VERSION_HEADER = "X-FFID-SDK-Version";
|
|
1233
1233
|
function sdkHeaders() {
|
|
@@ -1274,7 +1274,7 @@ npm install @feelflow/ffid-sdk@latest \u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
|
|
1274
1274
|
var OAUTH_TOKEN_ENDPOINT = "/api/v1/oauth/token";
|
|
1275
1275
|
var OAUTH_REVOKE_ENDPOINT = "/api/v1/oauth/revoke";
|
|
1276
1276
|
var MS_PER_SECOND = 1e3;
|
|
1277
|
-
function
|
|
1277
|
+
function invalidTokenFields(tokenResponse) {
|
|
1278
1278
|
const invalid = [];
|
|
1279
1279
|
if (!tokenResponse.access_token) {
|
|
1280
1280
|
invalid.push("access_token");
|
|
@@ -1285,10 +1285,19 @@ function validateTokenResponse(tokenResponse) {
|
|
|
1285
1285
|
if (typeof tokenResponse.expires_in !== "number" || !Number.isFinite(tokenResponse.expires_in) || tokenResponse.expires_in <= 0) {
|
|
1286
1286
|
invalid.push("expires_in");
|
|
1287
1287
|
}
|
|
1288
|
-
|
|
1289
|
-
|
|
1288
|
+
return invalid;
|
|
1289
|
+
}
|
|
1290
|
+
function hasValidatedTokens(tokenResponse) {
|
|
1291
|
+
return invalidTokenFields(tokenResponse).length === 0;
|
|
1292
|
+
}
|
|
1293
|
+
function validateTokenResponse(tokenResponse) {
|
|
1294
|
+
if (hasValidatedTokens(tokenResponse)) {
|
|
1295
|
+
return { ok: true, tokens: tokenResponse };
|
|
1290
1296
|
}
|
|
1291
|
-
return
|
|
1297
|
+
return {
|
|
1298
|
+
ok: false,
|
|
1299
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields(tokenResponse).join(", ")}`
|
|
1300
|
+
};
|
|
1292
1301
|
}
|
|
1293
1302
|
function createOAuthTokenMethods(deps) {
|
|
1294
1303
|
const {
|
|
@@ -1377,20 +1386,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1377
1386
|
}
|
|
1378
1387
|
};
|
|
1379
1388
|
}
|
|
1380
|
-
const
|
|
1381
|
-
if (
|
|
1382
|
-
logger.error("Token exchange validation failed:",
|
|
1389
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1390
|
+
if (!validation.ok) {
|
|
1391
|
+
logger.error("Token exchange validation failed:", validation.message);
|
|
1383
1392
|
return {
|
|
1384
1393
|
error: {
|
|
1385
1394
|
code: errorCodes.TOKEN_EXCHANGE_ERROR,
|
|
1386
|
-
message:
|
|
1395
|
+
message: validation.message
|
|
1387
1396
|
}
|
|
1388
1397
|
};
|
|
1389
1398
|
}
|
|
1390
1399
|
tokenStore.setTokens({
|
|
1391
|
-
accessToken:
|
|
1392
|
-
refreshToken:
|
|
1393
|
-
expiresAt: Date.now() +
|
|
1400
|
+
accessToken: validation.tokens.access_token,
|
|
1401
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1402
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1394
1403
|
});
|
|
1395
1404
|
logger.debug("Token exchange successful");
|
|
1396
1405
|
return { data: void 0 };
|
|
@@ -1455,20 +1464,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1455
1464
|
}
|
|
1456
1465
|
};
|
|
1457
1466
|
}
|
|
1458
|
-
const
|
|
1459
|
-
if (
|
|
1460
|
-
logger.error("Token refresh validation failed:",
|
|
1467
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1468
|
+
if (!validation.ok) {
|
|
1469
|
+
logger.error("Token refresh validation failed:", validation.message);
|
|
1461
1470
|
return {
|
|
1462
1471
|
error: {
|
|
1463
1472
|
code: errorCodes.TOKEN_REFRESH_ERROR,
|
|
1464
|
-
message:
|
|
1473
|
+
message: validation.message
|
|
1465
1474
|
}
|
|
1466
1475
|
};
|
|
1467
1476
|
}
|
|
1468
1477
|
tokenStore.setTokens({
|
|
1469
|
-
accessToken:
|
|
1470
|
-
refreshToken:
|
|
1471
|
-
expiresAt: Date.now() +
|
|
1478
|
+
accessToken: validation.tokens.access_token,
|
|
1479
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1480
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1472
1481
|
});
|
|
1473
1482
|
logger.debug("Token refresh successful");
|
|
1474
1483
|
return { data: void 0 };
|
|
@@ -1229,7 +1229,7 @@ function createNonContractMethods(deps) {
|
|
|
1229
1229
|
}
|
|
1230
1230
|
|
|
1231
1231
|
// src/client/version-check.ts
|
|
1232
|
-
var SDK_VERSION = "5.24.
|
|
1232
|
+
var SDK_VERSION = "5.24.2";
|
|
1233
1233
|
var SDK_USER_AGENT = `FFID-SDK/${SDK_VERSION} (TypeScript)`;
|
|
1234
1234
|
var SDK_VERSION_HEADER = "X-FFID-SDK-Version";
|
|
1235
1235
|
function sdkHeaders() {
|
|
@@ -1276,7 +1276,7 @@ npm install @feelflow/ffid-sdk@latest \u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
|
|
1276
1276
|
var OAUTH_TOKEN_ENDPOINT = "/api/v1/oauth/token";
|
|
1277
1277
|
var OAUTH_REVOKE_ENDPOINT = "/api/v1/oauth/revoke";
|
|
1278
1278
|
var MS_PER_SECOND = 1e3;
|
|
1279
|
-
function
|
|
1279
|
+
function invalidTokenFields(tokenResponse) {
|
|
1280
1280
|
const invalid = [];
|
|
1281
1281
|
if (!tokenResponse.access_token) {
|
|
1282
1282
|
invalid.push("access_token");
|
|
@@ -1287,10 +1287,19 @@ function validateTokenResponse(tokenResponse) {
|
|
|
1287
1287
|
if (typeof tokenResponse.expires_in !== "number" || !Number.isFinite(tokenResponse.expires_in) || tokenResponse.expires_in <= 0) {
|
|
1288
1288
|
invalid.push("expires_in");
|
|
1289
1289
|
}
|
|
1290
|
-
|
|
1291
|
-
|
|
1290
|
+
return invalid;
|
|
1291
|
+
}
|
|
1292
|
+
function hasValidatedTokens(tokenResponse) {
|
|
1293
|
+
return invalidTokenFields(tokenResponse).length === 0;
|
|
1294
|
+
}
|
|
1295
|
+
function validateTokenResponse(tokenResponse) {
|
|
1296
|
+
if (hasValidatedTokens(tokenResponse)) {
|
|
1297
|
+
return { ok: true, tokens: tokenResponse };
|
|
1292
1298
|
}
|
|
1293
|
-
return
|
|
1299
|
+
return {
|
|
1300
|
+
ok: false,
|
|
1301
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields(tokenResponse).join(", ")}`
|
|
1302
|
+
};
|
|
1294
1303
|
}
|
|
1295
1304
|
function createOAuthTokenMethods(deps) {
|
|
1296
1305
|
const {
|
|
@@ -1379,20 +1388,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1379
1388
|
}
|
|
1380
1389
|
};
|
|
1381
1390
|
}
|
|
1382
|
-
const
|
|
1383
|
-
if (
|
|
1384
|
-
logger.error("Token exchange validation failed:",
|
|
1391
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1392
|
+
if (!validation.ok) {
|
|
1393
|
+
logger.error("Token exchange validation failed:", validation.message);
|
|
1385
1394
|
return {
|
|
1386
1395
|
error: {
|
|
1387
1396
|
code: errorCodes.TOKEN_EXCHANGE_ERROR,
|
|
1388
|
-
message:
|
|
1397
|
+
message: validation.message
|
|
1389
1398
|
}
|
|
1390
1399
|
};
|
|
1391
1400
|
}
|
|
1392
1401
|
tokenStore.setTokens({
|
|
1393
|
-
accessToken:
|
|
1394
|
-
refreshToken:
|
|
1395
|
-
expiresAt: Date.now() +
|
|
1402
|
+
accessToken: validation.tokens.access_token,
|
|
1403
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1404
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1396
1405
|
});
|
|
1397
1406
|
logger.debug("Token exchange successful");
|
|
1398
1407
|
return { data: void 0 };
|
|
@@ -1457,20 +1466,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1457
1466
|
}
|
|
1458
1467
|
};
|
|
1459
1468
|
}
|
|
1460
|
-
const
|
|
1461
|
-
if (
|
|
1462
|
-
logger.error("Token refresh validation failed:",
|
|
1469
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1470
|
+
if (!validation.ok) {
|
|
1471
|
+
logger.error("Token refresh validation failed:", validation.message);
|
|
1463
1472
|
return {
|
|
1464
1473
|
error: {
|
|
1465
1474
|
code: errorCodes.TOKEN_REFRESH_ERROR,
|
|
1466
|
-
message:
|
|
1475
|
+
message: validation.message
|
|
1467
1476
|
}
|
|
1468
1477
|
};
|
|
1469
1478
|
}
|
|
1470
1479
|
tokenStore.setTokens({
|
|
1471
|
-
accessToken:
|
|
1472
|
-
refreshToken:
|
|
1473
|
-
expiresAt: Date.now() +
|
|
1480
|
+
accessToken: validation.tokens.access_token,
|
|
1481
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1482
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1474
1483
|
});
|
|
1475
1484
|
logger.debug("Token refresh successful");
|
|
1476
1485
|
return { data: void 0 };
|
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkQMWUOVZK_cjs = require('../chunk-QMWUOVZK.cjs');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "FFIDAnnouncementBadge", {
|
|
8
8
|
enumerable: true,
|
|
9
|
-
get: function () { return
|
|
9
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDAnnouncementBadge; }
|
|
10
10
|
});
|
|
11
11
|
Object.defineProperty(exports, "FFIDAnnouncementList", {
|
|
12
12
|
enumerable: true,
|
|
13
|
-
get: function () { return
|
|
13
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDAnnouncementList; }
|
|
14
14
|
});
|
|
15
15
|
Object.defineProperty(exports, "FFIDInquiryForm", {
|
|
16
16
|
enumerable: true,
|
|
17
|
-
get: function () { return
|
|
17
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDInquiryForm; }
|
|
18
18
|
});
|
|
19
19
|
Object.defineProperty(exports, "FFIDLoginButton", {
|
|
20
20
|
enumerable: true,
|
|
21
|
-
get: function () { return
|
|
21
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDLoginButton; }
|
|
22
22
|
});
|
|
23
23
|
Object.defineProperty(exports, "FFIDOrganizationSwitcher", {
|
|
24
24
|
enumerable: true,
|
|
25
|
-
get: function () { return
|
|
25
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDOrganizationSwitcher; }
|
|
26
26
|
});
|
|
27
27
|
Object.defineProperty(exports, "FFIDSubscriptionBadge", {
|
|
28
28
|
enumerable: true,
|
|
29
|
-
get: function () { return
|
|
29
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDSubscriptionBadge; }
|
|
30
30
|
});
|
|
31
31
|
Object.defineProperty(exports, "FFIDUserMenu", {
|
|
32
32
|
enumerable: true,
|
|
33
|
-
get: function () { return
|
|
33
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDUserMenu; }
|
|
34
34
|
});
|
package/dist/components/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { FFIDAnnouncementBadge, FFIDAnnouncementList, FFIDInquiryForm, FFIDLoginButton, FFIDOrganizationSwitcher, FFIDSubscriptionBadge, FFIDUserMenu } from '../chunk-
|
|
1
|
+
export { FFIDAnnouncementBadge, FFIDAnnouncementList, FFIDInquiryForm, FFIDLoginButton, FFIDOrganizationSwitcher, FFIDSubscriptionBadge, FFIDUserMenu } from '../chunk-Q7ZEF3EN.js';
|
package/dist/index.cjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkQMWUOVZK_cjs = require('./chunk-QMWUOVZK.cjs');
|
|
4
4
|
var chunkH5O2CCAY_cjs = require('./chunk-H5O2CCAY.cjs');
|
|
5
5
|
var react = require('react');
|
|
6
6
|
var jsxRuntime = require('react/jsx-runtime');
|
|
@@ -54,8 +54,8 @@ function defaultRedirect(url) {
|
|
|
54
54
|
}
|
|
55
55
|
function useRequireActiveSubscription(options) {
|
|
56
56
|
const { redirectTo, allowGrace = true, onRedirect } = options;
|
|
57
|
-
const { isLoading, error } =
|
|
58
|
-
const { effectiveStatus, isBlocked, isGrace } =
|
|
57
|
+
const { isLoading, error } = chunkQMWUOVZK_cjs.useFFIDContext();
|
|
58
|
+
const { effectiveStatus, isBlocked, isGrace } = chunkQMWUOVZK_cjs.useSubscription();
|
|
59
59
|
const hasFetchError = error !== null && effectiveStatus === null;
|
|
60
60
|
const shouldRedirect = !isLoading && !hasFetchError && (isBlocked || !allowGrace && isGrace || effectiveStatus === null);
|
|
61
61
|
react.useEffect(() => {
|
|
@@ -76,7 +76,7 @@ function useRequireActiveSubscription(options) {
|
|
|
76
76
|
}
|
|
77
77
|
function withFFIDAuth(Component, options = {}) {
|
|
78
78
|
const WrappedComponent = (props) => {
|
|
79
|
-
const { isLoading, isAuthenticated, login } =
|
|
79
|
+
const { isLoading, isAuthenticated, login } = chunkQMWUOVZK_cjs.useFFIDContext();
|
|
80
80
|
const hasRedirected = react.useRef(false);
|
|
81
81
|
react.useEffect(() => {
|
|
82
82
|
if (!isLoading && !isAuthenticated && options.redirectToLogin && !hasRedirected.current) {
|
|
@@ -105,155 +105,155 @@ var FFID_NEWSLETTER_DISPATCH_MAX_RECIPIENTS = 1e3;
|
|
|
105
105
|
|
|
106
106
|
Object.defineProperty(exports, "ACCESS_GRANTING_EFFECTIVE_STATUSES", {
|
|
107
107
|
enumerable: true,
|
|
108
|
-
get: function () { return
|
|
108
|
+
get: function () { return chunkQMWUOVZK_cjs.ACCESS_GRANTING_EFFECTIVE_STATUSES; }
|
|
109
109
|
});
|
|
110
110
|
Object.defineProperty(exports, "BLOCKING_EFFECTIVE_STATUSES", {
|
|
111
111
|
enumerable: true,
|
|
112
|
-
get: function () { return
|
|
112
|
+
get: function () { return chunkQMWUOVZK_cjs.BLOCKING_EFFECTIVE_STATUSES; }
|
|
113
113
|
});
|
|
114
114
|
Object.defineProperty(exports, "DEFAULT_API_BASE_URL", {
|
|
115
115
|
enumerable: true,
|
|
116
|
-
get: function () { return
|
|
116
|
+
get: function () { return chunkQMWUOVZK_cjs.DEFAULT_API_BASE_URL; }
|
|
117
117
|
});
|
|
118
118
|
Object.defineProperty(exports, "DEFAULT_OAUTH_SCOPES", {
|
|
119
119
|
enumerable: true,
|
|
120
|
-
get: function () { return
|
|
120
|
+
get: function () { return chunkQMWUOVZK_cjs.DEFAULT_OAUTH_SCOPES; }
|
|
121
121
|
});
|
|
122
122
|
Object.defineProperty(exports, "EFFECTIVE_SUBSCRIPTION_STATUSES", {
|
|
123
123
|
enumerable: true,
|
|
124
|
-
get: function () { return
|
|
124
|
+
get: function () { return chunkQMWUOVZK_cjs.EFFECTIVE_SUBSCRIPTION_STATUSES; }
|
|
125
125
|
});
|
|
126
126
|
Object.defineProperty(exports, "FFIDAnnouncementBadge", {
|
|
127
127
|
enumerable: true,
|
|
128
|
-
get: function () { return
|
|
128
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDAnnouncementBadge; }
|
|
129
129
|
});
|
|
130
130
|
Object.defineProperty(exports, "FFIDAnnouncementList", {
|
|
131
131
|
enumerable: true,
|
|
132
|
-
get: function () { return
|
|
132
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDAnnouncementList; }
|
|
133
133
|
});
|
|
134
134
|
Object.defineProperty(exports, "FFIDInquiryForm", {
|
|
135
135
|
enumerable: true,
|
|
136
|
-
get: function () { return
|
|
136
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDInquiryForm; }
|
|
137
137
|
});
|
|
138
138
|
Object.defineProperty(exports, "FFIDLoginButton", {
|
|
139
139
|
enumerable: true,
|
|
140
|
-
get: function () { return
|
|
140
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDLoginButton; }
|
|
141
141
|
});
|
|
142
142
|
Object.defineProperty(exports, "FFIDOrganizationSwitcher", {
|
|
143
143
|
enumerable: true,
|
|
144
|
-
get: function () { return
|
|
144
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDOrganizationSwitcher; }
|
|
145
145
|
});
|
|
146
146
|
Object.defineProperty(exports, "FFIDProvider", {
|
|
147
147
|
enumerable: true,
|
|
148
|
-
get: function () { return
|
|
148
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDProvider; }
|
|
149
149
|
});
|
|
150
150
|
Object.defineProperty(exports, "FFIDSDKError", {
|
|
151
151
|
enumerable: true,
|
|
152
|
-
get: function () { return
|
|
152
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDSDKError; }
|
|
153
153
|
});
|
|
154
154
|
Object.defineProperty(exports, "FFIDSubscriptionBadge", {
|
|
155
155
|
enumerable: true,
|
|
156
|
-
get: function () { return
|
|
156
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDSubscriptionBadge; }
|
|
157
157
|
});
|
|
158
158
|
Object.defineProperty(exports, "FFIDUserMenu", {
|
|
159
159
|
enumerable: true,
|
|
160
|
-
get: function () { return
|
|
160
|
+
get: function () { return chunkQMWUOVZK_cjs.FFIDUserMenu; }
|
|
161
161
|
});
|
|
162
162
|
Object.defineProperty(exports, "FFID_ANNOUNCEMENTS_ERROR_CODES", {
|
|
163
163
|
enumerable: true,
|
|
164
|
-
get: function () { return
|
|
164
|
+
get: function () { return chunkQMWUOVZK_cjs.FFID_ANNOUNCEMENTS_ERROR_CODES; }
|
|
165
165
|
});
|
|
166
166
|
Object.defineProperty(exports, "FFID_ERROR_CODES", {
|
|
167
167
|
enumerable: true,
|
|
168
|
-
get: function () { return
|
|
168
|
+
get: function () { return chunkQMWUOVZK_cjs.FFID_ERROR_CODES; }
|
|
169
169
|
});
|
|
170
170
|
Object.defineProperty(exports, "FFID_INQUIRY_CATEGORIES", {
|
|
171
171
|
enumerable: true,
|
|
172
|
-
get: function () { return
|
|
172
|
+
get: function () { return chunkQMWUOVZK_cjs.FFID_INQUIRY_CATEGORIES; }
|
|
173
173
|
});
|
|
174
174
|
Object.defineProperty(exports, "FFID_INQUIRY_CATEGORIES_SITE_2026", {
|
|
175
175
|
enumerable: true,
|
|
176
|
-
get: function () { return
|
|
176
|
+
get: function () { return chunkQMWUOVZK_cjs.FFID_INQUIRY_CATEGORIES_SITE_2026; }
|
|
177
177
|
});
|
|
178
178
|
Object.defineProperty(exports, "clearState", {
|
|
179
179
|
enumerable: true,
|
|
180
|
-
get: function () { return
|
|
180
|
+
get: function () { return chunkQMWUOVZK_cjs.cleanupStateStorage; }
|
|
181
181
|
});
|
|
182
182
|
Object.defineProperty(exports, "computeEffectiveStatusFromSession", {
|
|
183
183
|
enumerable: true,
|
|
184
|
-
get: function () { return
|
|
184
|
+
get: function () { return chunkQMWUOVZK_cjs.computeEffectiveStatusFromSession; }
|
|
185
185
|
});
|
|
186
186
|
Object.defineProperty(exports, "createFFIDAnnouncementsClient", {
|
|
187
187
|
enumerable: true,
|
|
188
|
-
get: function () { return
|
|
188
|
+
get: function () { return chunkQMWUOVZK_cjs.createFFIDAnnouncementsClient; }
|
|
189
189
|
});
|
|
190
190
|
Object.defineProperty(exports, "createFFIDClient", {
|
|
191
191
|
enumerable: true,
|
|
192
|
-
get: function () { return
|
|
192
|
+
get: function () { return chunkQMWUOVZK_cjs.createFFIDClient; }
|
|
193
193
|
});
|
|
194
194
|
Object.defineProperty(exports, "createTokenStore", {
|
|
195
195
|
enumerable: true,
|
|
196
|
-
get: function () { return
|
|
196
|
+
get: function () { return chunkQMWUOVZK_cjs.createTokenStore; }
|
|
197
197
|
});
|
|
198
198
|
Object.defineProperty(exports, "generateCodeChallenge", {
|
|
199
199
|
enumerable: true,
|
|
200
|
-
get: function () { return
|
|
200
|
+
get: function () { return chunkQMWUOVZK_cjs.generateCodeChallenge; }
|
|
201
201
|
});
|
|
202
202
|
Object.defineProperty(exports, "generateCodeVerifier", {
|
|
203
203
|
enumerable: true,
|
|
204
|
-
get: function () { return
|
|
204
|
+
get: function () { return chunkQMWUOVZK_cjs.generateCodeVerifier; }
|
|
205
205
|
});
|
|
206
206
|
Object.defineProperty(exports, "handleRedirectCallback", {
|
|
207
207
|
enumerable: true,
|
|
208
|
-
get: function () { return
|
|
208
|
+
get: function () { return chunkQMWUOVZK_cjs.handleRedirectCallback; }
|
|
209
209
|
});
|
|
210
210
|
Object.defineProperty(exports, "hasAccessFromUserinfo", {
|
|
211
211
|
enumerable: true,
|
|
212
|
-
get: function () { return
|
|
212
|
+
get: function () { return chunkQMWUOVZK_cjs.hasAccessFromUserinfo; }
|
|
213
213
|
});
|
|
214
214
|
Object.defineProperty(exports, "isBlockedFromUserinfo", {
|
|
215
215
|
enumerable: true,
|
|
216
|
-
get: function () { return
|
|
216
|
+
get: function () { return chunkQMWUOVZK_cjs.isBlockedFromUserinfo; }
|
|
217
217
|
});
|
|
218
218
|
Object.defineProperty(exports, "isFFIDInquiryCategorySite2026", {
|
|
219
219
|
enumerable: true,
|
|
220
|
-
get: function () { return
|
|
220
|
+
get: function () { return chunkQMWUOVZK_cjs.isFFIDInquiryCategorySite2026; }
|
|
221
221
|
});
|
|
222
222
|
Object.defineProperty(exports, "normalizeRedirectUri", {
|
|
223
223
|
enumerable: true,
|
|
224
|
-
get: function () { return
|
|
224
|
+
get: function () { return chunkQMWUOVZK_cjs.normalizeRedirectUri; }
|
|
225
225
|
});
|
|
226
226
|
Object.defineProperty(exports, "retrieveCodeVerifier", {
|
|
227
227
|
enumerable: true,
|
|
228
|
-
get: function () { return
|
|
228
|
+
get: function () { return chunkQMWUOVZK_cjs.retrieveCodeVerifier; }
|
|
229
229
|
});
|
|
230
230
|
Object.defineProperty(exports, "retrieveState", {
|
|
231
231
|
enumerable: true,
|
|
232
|
-
get: function () { return
|
|
232
|
+
get: function () { return chunkQMWUOVZK_cjs.retrieveState; }
|
|
233
233
|
});
|
|
234
234
|
Object.defineProperty(exports, "storeCodeVerifier", {
|
|
235
235
|
enumerable: true,
|
|
236
|
-
get: function () { return
|
|
236
|
+
get: function () { return chunkQMWUOVZK_cjs.storeCodeVerifier; }
|
|
237
237
|
});
|
|
238
238
|
Object.defineProperty(exports, "storeState", {
|
|
239
239
|
enumerable: true,
|
|
240
|
-
get: function () { return
|
|
240
|
+
get: function () { return chunkQMWUOVZK_cjs.storeState; }
|
|
241
241
|
});
|
|
242
242
|
Object.defineProperty(exports, "useFFID", {
|
|
243
243
|
enumerable: true,
|
|
244
|
-
get: function () { return
|
|
244
|
+
get: function () { return chunkQMWUOVZK_cjs.useFFID; }
|
|
245
245
|
});
|
|
246
246
|
Object.defineProperty(exports, "useFFIDAnnouncements", {
|
|
247
247
|
enumerable: true,
|
|
248
|
-
get: function () { return
|
|
248
|
+
get: function () { return chunkQMWUOVZK_cjs.useFFIDAnnouncements; }
|
|
249
249
|
});
|
|
250
250
|
Object.defineProperty(exports, "useSubscription", {
|
|
251
251
|
enumerable: true,
|
|
252
|
-
get: function () { return
|
|
252
|
+
get: function () { return chunkQMWUOVZK_cjs.useSubscription; }
|
|
253
253
|
});
|
|
254
254
|
Object.defineProperty(exports, "withSubscription", {
|
|
255
255
|
enumerable: true,
|
|
256
|
-
get: function () { return
|
|
256
|
+
get: function () { return chunkQMWUOVZK_cjs.withSubscription; }
|
|
257
257
|
});
|
|
258
258
|
Object.defineProperty(exports, "ALL_DENIED_EXCEPT_NECESSARY", {
|
|
259
259
|
enumerable: true,
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { useFFIDContext, useSubscription } from './chunk-
|
|
2
|
-
export { ACCESS_GRANTING_EFFECTIVE_STATUSES, BLOCKING_EFFECTIVE_STATUSES, DEFAULT_API_BASE_URL, DEFAULT_OAUTH_SCOPES, EFFECTIVE_SUBSCRIPTION_STATUSES, FFIDAnnouncementBadge, FFIDAnnouncementList, FFIDInquiryForm, FFIDLoginButton, FFIDOrganizationSwitcher, FFIDProvider, FFIDSDKError, FFIDSubscriptionBadge, FFIDUserMenu, FFID_ANNOUNCEMENTS_ERROR_CODES, FFID_ERROR_CODES, FFID_INQUIRY_CATEGORIES, FFID_INQUIRY_CATEGORIES_SITE_2026, cleanupStateStorage as clearState, computeEffectiveStatusFromSession, createFFIDAnnouncementsClient, createFFIDClient, createTokenStore, generateCodeChallenge, generateCodeVerifier, handleRedirectCallback, hasAccessFromUserinfo, isBlockedFromUserinfo, isFFIDInquiryCategorySite2026, normalizeRedirectUri, retrieveCodeVerifier, retrieveState, storeCodeVerifier, storeState, useFFID, useFFIDAnnouncements, useSubscription, withSubscription } from './chunk-
|
|
1
|
+
import { useFFIDContext, useSubscription } from './chunk-Q7ZEF3EN.js';
|
|
2
|
+
export { ACCESS_GRANTING_EFFECTIVE_STATUSES, BLOCKING_EFFECTIVE_STATUSES, DEFAULT_API_BASE_URL, DEFAULT_OAUTH_SCOPES, EFFECTIVE_SUBSCRIPTION_STATUSES, FFIDAnnouncementBadge, FFIDAnnouncementList, FFIDInquiryForm, FFIDLoginButton, FFIDOrganizationSwitcher, FFIDProvider, FFIDSDKError, FFIDSubscriptionBadge, FFIDUserMenu, FFID_ANNOUNCEMENTS_ERROR_CODES, FFID_ERROR_CODES, FFID_INQUIRY_CATEGORIES, FFID_INQUIRY_CATEGORIES_SITE_2026, cleanupStateStorage as clearState, computeEffectiveStatusFromSession, createFFIDAnnouncementsClient, createFFIDClient, createTokenStore, generateCodeChallenge, generateCodeVerifier, handleRedirectCallback, hasAccessFromUserinfo, isBlockedFromUserinfo, isFFIDInquiryCategorySite2026, normalizeRedirectUri, retrieveCodeVerifier, retrieveState, storeCodeVerifier, storeState, useFFID, useFFIDAnnouncements, useSubscription, withSubscription } from './chunk-Q7ZEF3EN.js';
|
|
3
3
|
export { ALL_DENIED_EXCEPT_NECESSARY, CONSENT_COOKIE_NAME, CONSENT_DISMISSAL_TIMESTAMP_KEY, COOKIE_VERSION, DEFAULT_CONSENT_ERROR_MESSAGES, FFIDAnalyticsProvider, FFIDConsentError, FFIDCookieBanner, FFIDCookieLink, FFIDCookieSettings, FFID_CONSENT_ERROR_CODES, clearConsentDismissalTimestamp, decodeConsentCookie, encodeConsentCookie, readConsentCookie, readConsentDismissalTimestamp, useFFIDConsent, useFFIDConsentPreferences, writeConsentCookie, writeConsentDismissalTimestamp } from './chunk-G7VOX64X.js';
|
|
4
4
|
import { useEffect, useRef } from 'react';
|
|
5
5
|
import { jsx, Fragment } from 'react/jsx-runtime';
|
package/dist/server/index.cjs
CHANGED
|
@@ -1224,7 +1224,7 @@ function createNonContractMethods(deps) {
|
|
|
1224
1224
|
}
|
|
1225
1225
|
|
|
1226
1226
|
// src/client/version-check.ts
|
|
1227
|
-
var SDK_VERSION = "5.24.
|
|
1227
|
+
var SDK_VERSION = "5.24.2";
|
|
1228
1228
|
var SDK_USER_AGENT = `FFID-SDK/${SDK_VERSION} (TypeScript)`;
|
|
1229
1229
|
var SDK_VERSION_HEADER = "X-FFID-SDK-Version";
|
|
1230
1230
|
function sdkHeaders() {
|
|
@@ -1271,7 +1271,7 @@ npm install @feelflow/ffid-sdk@latest \u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
|
|
1271
1271
|
var OAUTH_TOKEN_ENDPOINT = "/api/v1/oauth/token";
|
|
1272
1272
|
var OAUTH_REVOKE_ENDPOINT = "/api/v1/oauth/revoke";
|
|
1273
1273
|
var MS_PER_SECOND = 1e3;
|
|
1274
|
-
function
|
|
1274
|
+
function invalidTokenFields(tokenResponse) {
|
|
1275
1275
|
const invalid = [];
|
|
1276
1276
|
if (!tokenResponse.access_token) {
|
|
1277
1277
|
invalid.push("access_token");
|
|
@@ -1282,10 +1282,19 @@ function validateTokenResponse(tokenResponse) {
|
|
|
1282
1282
|
if (typeof tokenResponse.expires_in !== "number" || !Number.isFinite(tokenResponse.expires_in) || tokenResponse.expires_in <= 0) {
|
|
1283
1283
|
invalid.push("expires_in");
|
|
1284
1284
|
}
|
|
1285
|
-
|
|
1286
|
-
|
|
1285
|
+
return invalid;
|
|
1286
|
+
}
|
|
1287
|
+
function hasValidatedTokens(tokenResponse) {
|
|
1288
|
+
return invalidTokenFields(tokenResponse).length === 0;
|
|
1289
|
+
}
|
|
1290
|
+
function validateTokenResponse(tokenResponse) {
|
|
1291
|
+
if (hasValidatedTokens(tokenResponse)) {
|
|
1292
|
+
return { ok: true, tokens: tokenResponse };
|
|
1287
1293
|
}
|
|
1288
|
-
return
|
|
1294
|
+
return {
|
|
1295
|
+
ok: false,
|
|
1296
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields(tokenResponse).join(", ")}`
|
|
1297
|
+
};
|
|
1289
1298
|
}
|
|
1290
1299
|
function createOAuthTokenMethods(deps) {
|
|
1291
1300
|
const {
|
|
@@ -1374,20 +1383,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1374
1383
|
}
|
|
1375
1384
|
};
|
|
1376
1385
|
}
|
|
1377
|
-
const
|
|
1378
|
-
if (
|
|
1379
|
-
logger.error("Token exchange validation failed:",
|
|
1386
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1387
|
+
if (!validation.ok) {
|
|
1388
|
+
logger.error("Token exchange validation failed:", validation.message);
|
|
1380
1389
|
return {
|
|
1381
1390
|
error: {
|
|
1382
1391
|
code: errorCodes.TOKEN_EXCHANGE_ERROR,
|
|
1383
|
-
message:
|
|
1392
|
+
message: validation.message
|
|
1384
1393
|
}
|
|
1385
1394
|
};
|
|
1386
1395
|
}
|
|
1387
1396
|
tokenStore.setTokens({
|
|
1388
|
-
accessToken:
|
|
1389
|
-
refreshToken:
|
|
1390
|
-
expiresAt: Date.now() +
|
|
1397
|
+
accessToken: validation.tokens.access_token,
|
|
1398
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1399
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1391
1400
|
});
|
|
1392
1401
|
logger.debug("Token exchange successful");
|
|
1393
1402
|
return { data: void 0 };
|
|
@@ -1452,20 +1461,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1452
1461
|
}
|
|
1453
1462
|
};
|
|
1454
1463
|
}
|
|
1455
|
-
const
|
|
1456
|
-
if (
|
|
1457
|
-
logger.error("Token refresh validation failed:",
|
|
1464
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1465
|
+
if (!validation.ok) {
|
|
1466
|
+
logger.error("Token refresh validation failed:", validation.message);
|
|
1458
1467
|
return {
|
|
1459
1468
|
error: {
|
|
1460
1469
|
code: errorCodes.TOKEN_REFRESH_ERROR,
|
|
1461
|
-
message:
|
|
1470
|
+
message: validation.message
|
|
1462
1471
|
}
|
|
1463
1472
|
};
|
|
1464
1473
|
}
|
|
1465
1474
|
tokenStore.setTokens({
|
|
1466
|
-
accessToken:
|
|
1467
|
-
refreshToken:
|
|
1468
|
-
expiresAt: Date.now() +
|
|
1475
|
+
accessToken: validation.tokens.access_token,
|
|
1476
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1477
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1469
1478
|
});
|
|
1470
1479
|
logger.debug("Token refresh successful");
|
|
1471
1480
|
return { data: void 0 };
|
|
@@ -3411,14 +3420,26 @@ function withTimeout(init, timeout) {
|
|
|
3411
3420
|
}
|
|
3412
3421
|
return init;
|
|
3413
3422
|
}
|
|
3414
|
-
function
|
|
3423
|
+
function invalidTokenFields2(r) {
|
|
3415
3424
|
const invalid = [];
|
|
3416
3425
|
if (!r.access_token) invalid.push("access_token");
|
|
3417
3426
|
if (!r.refresh_token) invalid.push("refresh_token");
|
|
3418
3427
|
if (typeof r.expires_in !== "number" || !Number.isFinite(r.expires_in) || r.expires_in <= 0) {
|
|
3419
3428
|
invalid.push("expires_in");
|
|
3420
3429
|
}
|
|
3421
|
-
return invalid
|
|
3430
|
+
return invalid;
|
|
3431
|
+
}
|
|
3432
|
+
function hasValidatedTokens2(r) {
|
|
3433
|
+
return invalidTokenFields2(r).length === 0;
|
|
3434
|
+
}
|
|
3435
|
+
function validateTokenResponse2(r) {
|
|
3436
|
+
if (hasValidatedTokens2(r)) {
|
|
3437
|
+
return { ok: true, tokens: r };
|
|
3438
|
+
}
|
|
3439
|
+
return {
|
|
3440
|
+
ok: false,
|
|
3441
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields2(r).join(", ")}`
|
|
3442
|
+
};
|
|
3422
3443
|
}
|
|
3423
3444
|
function toTokens(r) {
|
|
3424
3445
|
return {
|
|
@@ -3465,11 +3486,11 @@ async function postToken(deps, body, fallbackErrorCode) {
|
|
|
3465
3486
|
const errorBody = json;
|
|
3466
3487
|
return fail(errorBody.error ?? fallbackErrorCode, errorBody.error_description ?? "\u30C8\u30FC\u30AF\u30F3\u51E6\u7406\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
|
|
3467
3488
|
}
|
|
3468
|
-
const
|
|
3469
|
-
if (
|
|
3470
|
-
return fail(fallbackErrorCode,
|
|
3489
|
+
const validation = validateTokenResponse2(json);
|
|
3490
|
+
if (!validation.ok) {
|
|
3491
|
+
return fail(fallbackErrorCode, validation.message);
|
|
3471
3492
|
}
|
|
3472
|
-
return { tokens: toTokens(
|
|
3493
|
+
return { tokens: toTokens(validation.tokens) };
|
|
3473
3494
|
}
|
|
3474
3495
|
function exchangeAuthorizationCodeServer(deps, code) {
|
|
3475
3496
|
return postToken(
|
package/dist/server/index.js
CHANGED
|
@@ -1223,7 +1223,7 @@ function createNonContractMethods(deps) {
|
|
|
1223
1223
|
}
|
|
1224
1224
|
|
|
1225
1225
|
// src/client/version-check.ts
|
|
1226
|
-
var SDK_VERSION = "5.24.
|
|
1226
|
+
var SDK_VERSION = "5.24.2";
|
|
1227
1227
|
var SDK_USER_AGENT = `FFID-SDK/${SDK_VERSION} (TypeScript)`;
|
|
1228
1228
|
var SDK_VERSION_HEADER = "X-FFID-SDK-Version";
|
|
1229
1229
|
function sdkHeaders() {
|
|
@@ -1270,7 +1270,7 @@ npm install @feelflow/ffid-sdk@latest \u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
|
|
|
1270
1270
|
var OAUTH_TOKEN_ENDPOINT = "/api/v1/oauth/token";
|
|
1271
1271
|
var OAUTH_REVOKE_ENDPOINT = "/api/v1/oauth/revoke";
|
|
1272
1272
|
var MS_PER_SECOND = 1e3;
|
|
1273
|
-
function
|
|
1273
|
+
function invalidTokenFields(tokenResponse) {
|
|
1274
1274
|
const invalid = [];
|
|
1275
1275
|
if (!tokenResponse.access_token) {
|
|
1276
1276
|
invalid.push("access_token");
|
|
@@ -1281,10 +1281,19 @@ function validateTokenResponse(tokenResponse) {
|
|
|
1281
1281
|
if (typeof tokenResponse.expires_in !== "number" || !Number.isFinite(tokenResponse.expires_in) || tokenResponse.expires_in <= 0) {
|
|
1282
1282
|
invalid.push("expires_in");
|
|
1283
1283
|
}
|
|
1284
|
-
|
|
1285
|
-
|
|
1284
|
+
return invalid;
|
|
1285
|
+
}
|
|
1286
|
+
function hasValidatedTokens(tokenResponse) {
|
|
1287
|
+
return invalidTokenFields(tokenResponse).length === 0;
|
|
1288
|
+
}
|
|
1289
|
+
function validateTokenResponse(tokenResponse) {
|
|
1290
|
+
if (hasValidatedTokens(tokenResponse)) {
|
|
1291
|
+
return { ok: true, tokens: tokenResponse };
|
|
1286
1292
|
}
|
|
1287
|
-
return
|
|
1293
|
+
return {
|
|
1294
|
+
ok: false,
|
|
1295
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields(tokenResponse).join(", ")}`
|
|
1296
|
+
};
|
|
1288
1297
|
}
|
|
1289
1298
|
function createOAuthTokenMethods(deps) {
|
|
1290
1299
|
const {
|
|
@@ -1373,20 +1382,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1373
1382
|
}
|
|
1374
1383
|
};
|
|
1375
1384
|
}
|
|
1376
|
-
const
|
|
1377
|
-
if (
|
|
1378
|
-
logger.error("Token exchange validation failed:",
|
|
1385
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1386
|
+
if (!validation.ok) {
|
|
1387
|
+
logger.error("Token exchange validation failed:", validation.message);
|
|
1379
1388
|
return {
|
|
1380
1389
|
error: {
|
|
1381
1390
|
code: errorCodes.TOKEN_EXCHANGE_ERROR,
|
|
1382
|
-
message:
|
|
1391
|
+
message: validation.message
|
|
1383
1392
|
}
|
|
1384
1393
|
};
|
|
1385
1394
|
}
|
|
1386
1395
|
tokenStore.setTokens({
|
|
1387
|
-
accessToken:
|
|
1388
|
-
refreshToken:
|
|
1389
|
-
expiresAt: Date.now() +
|
|
1396
|
+
accessToken: validation.tokens.access_token,
|
|
1397
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1398
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1390
1399
|
});
|
|
1391
1400
|
logger.debug("Token exchange successful");
|
|
1392
1401
|
return { data: void 0 };
|
|
@@ -1451,20 +1460,20 @@ function createOAuthTokenMethods(deps) {
|
|
|
1451
1460
|
}
|
|
1452
1461
|
};
|
|
1453
1462
|
}
|
|
1454
|
-
const
|
|
1455
|
-
if (
|
|
1456
|
-
logger.error("Token refresh validation failed:",
|
|
1463
|
+
const validation = validateTokenResponse(tokenResponse);
|
|
1464
|
+
if (!validation.ok) {
|
|
1465
|
+
logger.error("Token refresh validation failed:", validation.message);
|
|
1457
1466
|
return {
|
|
1458
1467
|
error: {
|
|
1459
1468
|
code: errorCodes.TOKEN_REFRESH_ERROR,
|
|
1460
|
-
message:
|
|
1469
|
+
message: validation.message
|
|
1461
1470
|
}
|
|
1462
1471
|
};
|
|
1463
1472
|
}
|
|
1464
1473
|
tokenStore.setTokens({
|
|
1465
|
-
accessToken:
|
|
1466
|
-
refreshToken:
|
|
1467
|
-
expiresAt: Date.now() +
|
|
1474
|
+
accessToken: validation.tokens.access_token,
|
|
1475
|
+
refreshToken: validation.tokens.refresh_token,
|
|
1476
|
+
expiresAt: Date.now() + validation.tokens.expires_in * MS_PER_SECOND
|
|
1468
1477
|
});
|
|
1469
1478
|
logger.debug("Token refresh successful");
|
|
1470
1479
|
return { data: void 0 };
|
|
@@ -3410,14 +3419,26 @@ function withTimeout(init, timeout) {
|
|
|
3410
3419
|
}
|
|
3411
3420
|
return init;
|
|
3412
3421
|
}
|
|
3413
|
-
function
|
|
3422
|
+
function invalidTokenFields2(r) {
|
|
3414
3423
|
const invalid = [];
|
|
3415
3424
|
if (!r.access_token) invalid.push("access_token");
|
|
3416
3425
|
if (!r.refresh_token) invalid.push("refresh_token");
|
|
3417
3426
|
if (typeof r.expires_in !== "number" || !Number.isFinite(r.expires_in) || r.expires_in <= 0) {
|
|
3418
3427
|
invalid.push("expires_in");
|
|
3419
3428
|
}
|
|
3420
|
-
return invalid
|
|
3429
|
+
return invalid;
|
|
3430
|
+
}
|
|
3431
|
+
function hasValidatedTokens2(r) {
|
|
3432
|
+
return invalidTokenFields2(r).length === 0;
|
|
3433
|
+
}
|
|
3434
|
+
function validateTokenResponse2(r) {
|
|
3435
|
+
if (hasValidatedTokens2(r)) {
|
|
3436
|
+
return { ok: true, tokens: r };
|
|
3437
|
+
}
|
|
3438
|
+
return {
|
|
3439
|
+
ok: false,
|
|
3440
|
+
message: `\u30C8\u30FC\u30AF\u30F3\u30EC\u30B9\u30DD\u30F3\u30B9\u306B\u4E0D\u6B63\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3042\u308A\u307E\u3059: ${invalidTokenFields2(r).join(", ")}`
|
|
3441
|
+
};
|
|
3421
3442
|
}
|
|
3422
3443
|
function toTokens(r) {
|
|
3423
3444
|
return {
|
|
@@ -3464,11 +3485,11 @@ async function postToken(deps, body, fallbackErrorCode) {
|
|
|
3464
3485
|
const errorBody = json;
|
|
3465
3486
|
return fail(errorBody.error ?? fallbackErrorCode, errorBody.error_description ?? "\u30C8\u30FC\u30AF\u30F3\u51E6\u7406\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
|
|
3466
3487
|
}
|
|
3467
|
-
const
|
|
3468
|
-
if (
|
|
3469
|
-
return fail(fallbackErrorCode,
|
|
3488
|
+
const validation = validateTokenResponse2(json);
|
|
3489
|
+
if (!validation.ok) {
|
|
3490
|
+
return fail(fallbackErrorCode, validation.message);
|
|
3470
3491
|
}
|
|
3471
|
-
return { tokens: toTokens(
|
|
3492
|
+
return { tokens: toTokens(validation.tokens) };
|
|
3472
3493
|
}
|
|
3473
3494
|
function exchangeAuthorizationCodeServer(deps, code) {
|
|
3474
3495
|
return postToken(
|