@ofidj/node 1.0.1 → 3.6.24
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/CHANGELOG.md +15 -0
- package/README.md +70 -0
- package/bpInfo.js +2 -2
- package/connection/Ajax.js +2 -2
- package/identity/FidjOidcClient.d.ts +27 -0
- package/identity/FidjOidcClient.js +168 -0
- package/index.d.ts +2 -0
- package/index.js +3 -1
- package/package.json +8 -5
- package/sdk/FidjNodeService.d.ts +7 -1
- package/sdk/FidjNodeService.js +77 -23
- package/sdk/IService.d.ts +5 -0
- package/server/verifyAppSession.d.ts +27 -0
- package/server/verifyAppSession.js +106 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
- Add validated OIDC/PKCE client, same-tab facade handoff and live tenant verification; remove the obsolete URL-join dependency and update Axios.
|
|
4
|
+
|
|
5
|
+
- Read effective roles live, including app groups; fail closed when the session is invalid.
|
|
6
|
+
|
|
7
|
+
- Add shared-account password recovery and email verification integration.
|
|
8
|
+
|
|
9
|
+
## 3.6.24 — Unreleased
|
|
10
|
+
|
|
11
|
+
- Add verifyAppSession for server-side audience/session verification and live membership roles; used by the generated TypeScript starter.
|
|
12
|
+
- Align the Mocha test runner with the API for current Node runtimes.
|
|
13
|
+
|
|
14
|
+
- Preserve DELETE request bodies through the SDK and Axios adapter, including explicit app-departure confirmation.
|
|
15
|
+
|
|
3
16
|
All notable changes to this project will be documented in this file.
|
|
4
17
|
|
|
5
18
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
@@ -7,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
20
|
|
|
8
21
|
## [Unreleased]
|
|
9
22
|
|
|
23
|
+
## [15.1.14] - 2025-12-03
|
|
24
|
+
|
|
10
25
|
## [1.0.1] - 2026-05-27
|
|
11
26
|
|
|
12
27
|
### Changed
|
package/README.md
CHANGED
|
@@ -70,3 +70,73 @@ See [Changelog](./CHANGELOG.md).
|
|
|
70
70
|
## 📄 License
|
|
71
71
|
|
|
72
72
|
MIT
|
|
73
|
+
|
|
74
|
+
## Server-side app sessions
|
|
75
|
+
|
|
76
|
+
The 3.6.24 development version exports `verifyAppSession` for a Node backend:
|
|
77
|
+
|
|
78
|
+
```typescript
|
|
79
|
+
import {verifyAppSession} from '@ofidj/node';
|
|
80
|
+
|
|
81
|
+
const session = await verifyAppSession(bearerToken, {
|
|
82
|
+
appId: process.env.FIDJ_APP_ID!,
|
|
83
|
+
apiEndpoint: process.env.FIDJ_API_ENDPOINT!,
|
|
84
|
+
});
|
|
85
|
+
if (!session.roles.includes('Editor') && !session.roles.includes('Owner')) {
|
|
86
|
+
// Respond with 403 before executing the protected operation.
|
|
87
|
+
}
|
|
88
|
+
```
|
|
89
|
+
|
|
90
|
+
Call it on every protected operation. It rejects tokens for another app, delegates signature and stored-session validation to the configured Fidj API, and returns current membership roles rather than cached JWT role claims. It fails closed on timeouts or invalid upstream responses. Keep the endpoint configuration server-controlled and use HTTPS outside loopback development. No app signing key is required in the consumer backend.
|
|
91
|
+
|
|
92
|
+
The generated TypeScript starter and the mleweb example exercise this flow. This helper requires a runtime with `fetch` and `AbortSignal.timeout`; the examples and CI target Node 22/24.
|
|
93
|
+
|
|
94
|
+
## Account recovery and verification
|
|
95
|
+
|
|
96
|
+
After `init`, call `fidjForgotPasswordRequest(email)` for a neutral reset request, `resetPassword({token, password})` to consume a link, or `verifyEmail({token})` for explicit confirmation. These three methods work without an authenticated session. `resendVerification()` requires a signed-in session; `getMe()` returns `data.user.verified`. A reset changes the shared identity password and revokes existing sessions across apps.
|
|
97
|
+
|
|
98
|
+
Requires the coordinated 3.6.24 API and contracts changes. Passwords must contain at least 12 characters and no more than 72 UTF-8 bytes. Email links point to the API’s configured account UI.
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
`fidjRoles()` also reads effective roles from the API for signed-in sessions, including app-group grants and removals. It can now reject when the session or API is unavailable; handle that error instead of relying on cached access. Demo mode keeps its local behavior. `verifyAppSession` remains the check to use on protected backend operations; client UI checks alone do not authorize a request.
|
|
102
|
+
|
|
103
|
+
Authenticated `PUT /me` password changes require `{currentPassword, password}`. They apply the same password limits as reset, revoke existing sessions, and invalidate outstanding reset links. Sign in again after success. Name-only updates do not change credentials.
|
|
104
|
+
|
|
105
|
+
## Integrated OIDC beta
|
|
106
|
+
|
|
107
|
+
Use Node 22 LTS or later. `FidjOidcClient` uses `oauth4webapi` for protocol validation; the configured issuer and REST API must share an origin. Register the exact callback with the app owner console first.
|
|
108
|
+
|
|
109
|
+
```typescript
|
|
110
|
+
import {FidjOidcClient} from '@ofidj/node';
|
|
111
|
+
const identity = new FidjOidcClient({
|
|
112
|
+
issuer: 'https://api.sandbox.fidj.ovh/oidc',
|
|
113
|
+
clientId: 'YOUR_APP_ID',
|
|
114
|
+
redirectUri: window.location.origin + window.location.pathname,
|
|
115
|
+
apiEndpoint: 'https://api.sandbox.fidj.ovh/v3',
|
|
116
|
+
storage: sessionStorage,
|
|
117
|
+
});
|
|
118
|
+
// On the sign-in action:
|
|
119
|
+
window.location.assign(await identity.beginLogin());
|
|
120
|
+
// On the registered callback, before opening application content:
|
|
121
|
+
await identity.completeLogin(new URL(window.location.href));
|
|
122
|
+
const accessToken = await identity.accessToken();
|
|
123
|
+
```
|
|
124
|
+
|
|
125
|
+
These are two lifecycle steps, not consecutive actions on one page load. Remove callback query parameters from browser history after capturing the callback. Transactions expire after ten minutes and are consumed once. The client validates issuer, state, nonce and ID-token signatures. Refresh calls are serialized within one client instance; expired/replayed sessions require login again. `logout()` revokes the app grant and clears local session storage.
|
|
126
|
+
|
|
127
|
+
The generated same-origin module and `FidjNodeService` facade recognize this same-tab session. The facade retains its historical API token-getter name for existing consumers; use `accessToken()` for new OIDC API integrations. The standalone ID token is identity evidence, not a REST bearer credential. A production backend-for-frontend with HttpOnly cookies remains a separate integration choice for confidential applications.
|
|
128
|
+
|
|
129
|
+
Backend tenant authorization:
|
|
130
|
+
|
|
131
|
+
```typescript
|
|
132
|
+
import {verifyOrganizationSession} from '@ofidj/node';
|
|
133
|
+
const access = await verifyOrganizationSession(bearerToken, {
|
|
134
|
+
appId: process.env.FIDJ_APP_ID!,
|
|
135
|
+
apiEndpoint: process.env.FIDJ_API_ENDPOINT!,
|
|
136
|
+
organizationId,
|
|
137
|
+
permission: 'projects:write',
|
|
138
|
+
});
|
|
139
|
+
// Scope the application database query to access.organizationId as well.
|
|
140
|
+
```
|
|
141
|
+
|
|
142
|
+
`verifyAppSession` now supports live opaque OIDC access tokens and validates the authoritative app/subject response. An app-wide role does not grant organization access. The integrated API tests exercise the shipped OIDC client, backend verifier and facade. Hosted issuer activation, independent conformance and stable package publication remain release gates.
|
package/bpInfo.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.bpInfo = void 0;
|
|
4
|
-
exports.bpInfo = { version: '
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
exports.bpInfo = { version: 'v3.6.24' };
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnBJbmZvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2JwSW5mby50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLE1BQU0sR0FBRyxFQUFDLE9BQU8sRUFBRSxTQUFTLEVBQUMsQ0FBQyJ9
|
package/connection/Ajax.js
CHANGED
|
@@ -181,7 +181,7 @@ class Ajax {
|
|
|
181
181
|
if (args.headers) {
|
|
182
182
|
opt.headers = args.headers;
|
|
183
183
|
}
|
|
184
|
-
const options = { headers: opt.headers };
|
|
184
|
+
const options = { headers: opt.headers, data: opt.data };
|
|
185
185
|
if (args.timeout) {
|
|
186
186
|
options['timeout'] = args.timeout;
|
|
187
187
|
}
|
|
@@ -227,4 +227,4 @@ class Ajax {
|
|
|
227
227
|
}
|
|
228
228
|
}
|
|
229
229
|
exports.Ajax = Ajax;
|
|
230
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Ajax.js","sourceRoot":"","sources":["../../src/connection/Ajax.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import * as oauth from 'oauth4webapi';
|
|
2
|
+
export interface OidcOptions {
|
|
3
|
+
issuer: string;
|
|
4
|
+
clientId: string;
|
|
5
|
+
redirectUri: string;
|
|
6
|
+
apiEndpoint: string;
|
|
7
|
+
storage: Pick<Storage, 'getItem' | 'setItem' | 'removeItem'>;
|
|
8
|
+
}
|
|
9
|
+
export declare class FidjOidcClient {
|
|
10
|
+
private options;
|
|
11
|
+
private metadata;
|
|
12
|
+
private refreshPending;
|
|
13
|
+
private readonly prefix;
|
|
14
|
+
constructor(options: OidcOptions);
|
|
15
|
+
private network;
|
|
16
|
+
private discovery;
|
|
17
|
+
hasSession(): boolean;
|
|
18
|
+
private session;
|
|
19
|
+
beginLogin(): Promise<string>;
|
|
20
|
+
completeLogin(callback: URL): Promise<oauth.IDToken>;
|
|
21
|
+
private save;
|
|
22
|
+
accessToken(): Promise<string>;
|
|
23
|
+
private refresh;
|
|
24
|
+
request(path: string, method?: string, data?: unknown): Promise<any>;
|
|
25
|
+
logout(): Promise<void>;
|
|
26
|
+
clear(): void;
|
|
27
|
+
}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
45
|
+
var t = {};
|
|
46
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
47
|
+
t[p] = s[p];
|
|
48
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
49
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
50
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
51
|
+
t[p[i]] = s[p[i]];
|
|
52
|
+
}
|
|
53
|
+
return t;
|
|
54
|
+
};
|
|
55
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
56
|
+
exports.FidjOidcClient = void 0;
|
|
57
|
+
const oauth = __importStar(require("oauth4webapi"));
|
|
58
|
+
class FidjOidcClient {
|
|
59
|
+
constructor(options) {
|
|
60
|
+
this.options = options;
|
|
61
|
+
const issuer = new URL(options.issuer), api = new URL(options.apiEndpoint), redirect = new URL(options.redirectUri);
|
|
62
|
+
if (issuer.origin !== api.origin || issuer.pathname !== '/oidc' || issuer.search || issuer.hash || issuer.username || issuer.password || (issuer.protocol !== 'https:' && !['localhost', '127.0.0.1'].includes(issuer.hostname)) || redirect.hash || redirect.username || redirect.password || (redirect.protocol !== 'https:' && !['localhost', '127.0.0.1'].includes(redirect.hostname)))
|
|
63
|
+
throw new Error('Use a trusted issuer/API origin and an exact HTTPS callback (loopback allowed for development).');
|
|
64
|
+
this.prefix = 'fidj.oidc.' + options.clientId;
|
|
65
|
+
}
|
|
66
|
+
network() { return Object.assign(Object.assign({}, (this.options.issuer.startsWith('http:') ? { [oauth.allowInsecureRequests]: true } : {})), { signal: AbortSignal.timeout(10000) }); }
|
|
67
|
+
discovery() {
|
|
68
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
69
|
+
if (!this.metadata) {
|
|
70
|
+
const issuer = new URL(this.options.issuer);
|
|
71
|
+
this.metadata = yield oauth.processDiscoveryResponse(issuer, yield oauth.discoveryRequest(issuer, Object.assign(Object.assign({}, this.network()), { algorithm: 'oidc' })));
|
|
72
|
+
for (const endpoint of ['authorization_endpoint', 'token_endpoint', 'jwks_uri'])
|
|
73
|
+
if (new URL(String(this.metadata[endpoint])).origin !== issuer.origin)
|
|
74
|
+
throw new Error('Unexpected identity endpoint origin');
|
|
75
|
+
}
|
|
76
|
+
return this.metadata;
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
hasSession() { return !!this.options.storage.getItem(this.prefix + '.session'); }
|
|
80
|
+
session() { return JSON.parse(this.options.storage.getItem(this.prefix + '.session') || 'null'); }
|
|
81
|
+
beginLogin() {
|
|
82
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
const as = yield this.discovery(), verifier = oauth.generateRandomCodeVerifier(), state = oauth.generateRandomState(), nonce = oauth.generateRandomNonce();
|
|
84
|
+
this.options.storage.setItem(this.prefix + '.transaction', JSON.stringify({ verifier, state, nonce, createdAt: Date.now() }));
|
|
85
|
+
const url = new URL(as.authorization_endpoint);
|
|
86
|
+
url.search = new URLSearchParams({ client_id: this.options.clientId, redirect_uri: this.options.redirectUri, response_type: 'code', scope: 'openid profile email offline_access fidj:api', prompt: 'login consent', state, nonce, code_challenge: yield oauth.calculatePKCECodeChallenge(verifier), code_challenge_method: 'S256' }).toString();
|
|
87
|
+
return url.href;
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
completeLogin(callback) {
|
|
91
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
92
|
+
const transaction = JSON.parse(this.options.storage.getItem(this.prefix + '.transaction') || 'null');
|
|
93
|
+
this.options.storage.removeItem(this.prefix + '.transaction');
|
|
94
|
+
const expected = new URL(this.options.redirectUri);
|
|
95
|
+
if (!transaction || Date.now() - transaction.createdAt > 600000 || callback.origin !== expected.origin || callback.pathname !== expected.pathname)
|
|
96
|
+
throw new Error('Login transaction expired or callback mismatch');
|
|
97
|
+
const as = yield this.discovery(), client = { client_id: this.options.clientId };
|
|
98
|
+
const params = oauth.validateAuthResponse(as, client, callback, transaction.state);
|
|
99
|
+
const response = yield oauth.authorizationCodeGrantRequest(as, client, oauth.None(), params, this.options.redirectUri, transaction.verifier, this.network());
|
|
100
|
+
const tokens = yield oauth.processAuthorizationCodeResponse(as, client, response, { expectedNonce: transaction.nonce, requireIdToken: true });
|
|
101
|
+
yield oauth.validateApplicationLevelSignature(as, response, this.network());
|
|
102
|
+
const identity = oauth.getValidatedIdTokenClaims(tokens);
|
|
103
|
+
this.save(tokens, identity);
|
|
104
|
+
const _a = this.options, { storage } = _a, publicOptions = __rest(_a, ["storage"]);
|
|
105
|
+
storage.setItem(this.prefix + '.config', JSON.stringify(publicOptions));
|
|
106
|
+
return identity;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
save(tokens, identity) { this.options.storage.setItem(this.prefix + '.session', JSON.stringify({ tokens, identity, expiresAt: Date.now() + Number(tokens.expires_in || 300) * 1000 })); }
|
|
110
|
+
accessToken() {
|
|
111
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
112
|
+
const session = this.session();
|
|
113
|
+
if (!session)
|
|
114
|
+
throw Object.assign(new Error('Sign in first'), { code: 401 });
|
|
115
|
+
if (session.expiresAt < Date.now() + 30000) {
|
|
116
|
+
if (!this.refreshPending)
|
|
117
|
+
this.refreshPending = this.refresh().finally(() => { this.refreshPending = undefined; });
|
|
118
|
+
yield this.refreshPending;
|
|
119
|
+
}
|
|
120
|
+
return this.session().tokens.access_token;
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
refresh() {
|
|
124
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
const session = this.session();
|
|
126
|
+
try {
|
|
127
|
+
const as = yield this.discovery(), client = { client_id: this.options.clientId };
|
|
128
|
+
if (!(session === null || session === void 0 ? void 0 : session.tokens.refresh_token))
|
|
129
|
+
throw new Error('No refresh token');
|
|
130
|
+
const response = yield oauth.refreshTokenGrantRequest(as, client, oauth.None(), session.tokens.refresh_token, this.network());
|
|
131
|
+
const tokens = yield oauth.processRefreshTokenResponse(as, client, response);
|
|
132
|
+
if (tokens.id_token)
|
|
133
|
+
yield oauth.validateApplicationLevelSignature(as, response, this.network());
|
|
134
|
+
this.save(tokens, session.identity);
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
this.clear();
|
|
138
|
+
throw Object.assign(new Error('Session expired; sign in again'), { code: 401, cause: error });
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
request(path_1) {
|
|
143
|
+
return __awaiter(this, arguments, void 0, function* (path, method = 'GET', data) {
|
|
144
|
+
if (!path.startsWith('/') || path.startsWith('//') || path.includes('..'))
|
|
145
|
+
throw new Error('Use an API-relative path');
|
|
146
|
+
const response = yield fetch(this.options.apiEndpoint.replace(/\/$/, '') + path, { method, headers: { Authorization: 'Bearer ' + (yield this.accessToken()), 'Content-Type': 'application/json' }, body: data === undefined ? undefined : JSON.stringify(data), redirect: 'error', signal: AbortSignal.timeout(10000) });
|
|
147
|
+
const result = response.status === 204 ? undefined : yield response.json();
|
|
148
|
+
if (!response.ok) {
|
|
149
|
+
if (response.status === 401)
|
|
150
|
+
this.clear();
|
|
151
|
+
throw Object.assign(new Error((result === null || result === void 0 ? void 0 : result.message) || 'Request failed'), { code: response.status });
|
|
152
|
+
}
|
|
153
|
+
return { status: response.status, data: result };
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
logout() {
|
|
157
|
+
return __awaiter(this, void 0, void 0, function* () { try {
|
|
158
|
+
if (this.hasSession())
|
|
159
|
+
yield this.request('/me/oidc/logout', 'POST', {});
|
|
160
|
+
}
|
|
161
|
+
finally {
|
|
162
|
+
this.clear();
|
|
163
|
+
} });
|
|
164
|
+
}
|
|
165
|
+
clear() { this.options.storage.removeItem(this.prefix + '.session'); this.options.storage.removeItem(this.prefix + '.transaction'); }
|
|
166
|
+
}
|
|
167
|
+
exports.FidjOidcClient = FidjOidcClient;
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FidjOidcClient.js","sourceRoot":"","sources":["../../src/identity/FidjOidcClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsC;AAEtC,MAAa,cAAc;IAIvB,YAAoB,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;QACpC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpH,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,iGAAiG,CAAC,CAAC;QAC/e,IAAI,CAAC,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClD,CAAC;IACO,OAAO,KAAI,uCAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAE,CAAA,CAAC;IAC7I,SAAS;;YACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAAA,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,KAAK,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,gBAAgB,CAAC,MAAM,kCAAM,IAAI,CAAC,OAAO,EAAE,KAAE,SAAS,EAAE,MAAM,IAAE,CAAC,CAAC;gBACzM,KAAK,MAAM,QAAQ,IAAI,CAAC,wBAAwB,EAAE,gBAAgB,EAAE,UAAU,CAAC;oBAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;wBAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACnN,CAAC;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;KAAA;IACD,UAAU,KAAI,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAA,CAAC;IACvE,OAAO,KAAI,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,MAAM,CAAC,CAAC,CAAA,CAAC;IAClG,UAAU;;YACZ,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,GAAG,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,mBAAmB,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC3J,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAC,CAAC,CAAC,CAAC;YAC5H,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC;YAC/C,GAAG,CAAC,MAAM,GAAG,IAAI,eAAe,CAAC,EAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,8CAA8C,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9U,OAAO,GAAG,CAAC,IAAI,CAAC;QACpB,CAAC;KAAA;IACK,aAAa,CAAC,QAAa;;YAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,IAAI,MAAM,CAAC,CAAC;YACrG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,SAAS,GAAG,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACrN,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,GAAG,EAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YACnF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7J,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,gCAAgC,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAC,aAAa,EAAE,WAAW,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC,CAAC;YAC5I,MAAM,KAAK,CAAC,iCAAiC,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC5B,MAAM,KAA8B,IAAI,CAAC,OAAO,EAA1C,EAAC,OAAO,OAAkC,EAA7B,aAAa,cAA1B,WAA2B,CAAe,CAAC;YACjD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;YACxE,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IACO,IAAI,CAAC,MAAW,EAAE,QAAa,IAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,GAAG,CAAC,GAAG,IAAI,EAAC,CAAC,CAAC,CAAC,CAAA,CAAC;IACjM,WAAW;;YACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;YAC3E,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,cAAc;oBAAE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAE,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,CAAA,CAAC,CAAC,CAAC;gBACjH,MAAM,IAAI,CAAC,cAAc,CAAC;YAC9B,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,YAAsB,CAAC;QACxD,CAAC;KAAA;IACa,OAAO;;YACjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,GAAG,EAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAC,CAAC;gBAC/E,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,aAAa,CAAA;oBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACxE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9H,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,2BAA2B,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAC7E,IAAI,MAAM,CAAC,QAAQ;oBAAE,MAAM,KAAK,CAAC,iCAAiC,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAAA,IAAI,CAAC,KAAK,EAAE,CAAC;gBAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,EAAE,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;YAAA,CAAC;QAChI,CAAC;KAAA;IACK,OAAO;6DAAC,IAAY,EAAE,MAAM,GAAG,KAAK,EAAE,IAAc;YACtD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YACvH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,EAAC,aAAa,EAAE,SAAS,IAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA,EAAE,cAAc,EAAE,kBAAkB,EAAC,EAAE,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC;YACnT,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC3E,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAAA,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;oBAAE,IAAI,CAAC,KAAK,EAAE,CAAC;gBAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,gBAAgB,CAAC,EAAE,EAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAC,CAAC,CAAC;YAAA,CAAC;YAC5J,OAAO,EAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;QACnD,CAAC;KAAA;IACK,MAAM;8DAAI,IAAI,CAAC;YAAA,IAAI,IAAI,CAAC,UAAU,EAAE;gBAAE,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAAA,CAAC;gBAAS,CAAC;YAAA,IAAI,CAAC,KAAK,EAAE,CAAC;QAAA,CAAC,CAAA,CAAC;KAAA;IACxH,KAAK,KAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CAAA,CAAC;CACtI;AAvED,wCAuEC"}
|
package/index.d.ts
CHANGED
package/index.js
CHANGED
|
@@ -20,4 +20,6 @@ __exportStar(require("./session"), exports);
|
|
|
20
20
|
__exportStar(require("./tools"), exports);
|
|
21
21
|
// API contracts (TypeScript interfaces for REST endpoints) — re-exported from @ofidj/contracts
|
|
22
22
|
__exportStar(require("@ofidj/contracts"), exports);
|
|
23
|
-
|
|
23
|
+
__exportStar(require("./server/verifyAppSession"), exports);
|
|
24
|
+
__exportStar(require("./identity/FidjOidcClient"), exports);
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUE2QjtBQUM3Qix3Q0FBc0I7QUFDdEIsNENBQTBCO0FBQzFCLDBDQUF3QjtBQUV4QiwrRkFBK0Y7QUFDL0YsbURBQWlDO0FBQ2pDLDREQUEwQztBQUUxQyw0REFBMEMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ofidj/node",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.6.24",
|
|
4
4
|
"author": "fidj",
|
|
5
5
|
"description": "fidj node tools ",
|
|
6
6
|
"keywords": [],
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
"test-coverage": "nyc npm run test"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@ofidj/contracts": "^
|
|
42
|
-
"axios": "
|
|
41
|
+
"@ofidj/contracts": "^3.6.24",
|
|
42
|
+
"axios": "1.20.0",
|
|
43
43
|
"base-64": "^1.0.0",
|
|
44
|
-
"
|
|
44
|
+
"oauth4webapi": "3.8.2"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@eslint/eslintrc": "^3.3.1",
|
|
@@ -62,11 +62,14 @@
|
|
|
62
62
|
"eslint-plugin-prettier": "^5.4.1",
|
|
63
63
|
"jasmine": "^5.8.0",
|
|
64
64
|
"jasmine-ajax": "^4.0.0",
|
|
65
|
-
"mocha": "^
|
|
65
|
+
"mocha": "^11.8.0",
|
|
66
66
|
"nyc": "^15.1.0",
|
|
67
67
|
"prettier": "^3.5.3",
|
|
68
68
|
"ts-node": "^10.9.2",
|
|
69
69
|
"tslint": "^6.1.3",
|
|
70
70
|
"typescript": "^5.6.3"
|
|
71
|
+
},
|
|
72
|
+
"engines": {
|
|
73
|
+
"node": ">=22"
|
|
71
74
|
}
|
|
72
75
|
}
|
package/sdk/FidjNodeService.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as connection from '../connection';
|
|
2
2
|
import { EndpointCallInterface, EndpointFilterInterface, EndpointInterface, ErrorInterface, LoggerInterface, ModuleServiceInitOptionsInterface, ModuleServiceLoginCallOptionsInterface, ModuleServiceLoginOptionsInterface } from './Interfaces';
|
|
3
3
|
import { IService } from './IService';
|
|
4
|
-
import { FidjApiConsentsResponse, FidjApiConsentsUpdateRequest, FidjApiConsentsHistoryResponse, FidjApiUsersMeResponse, FidjApiUsersMeDetailsResponse, FidjApiUsersMeUpdateRequest } from '@ofidj/contracts';
|
|
4
|
+
import { FidjApiConsentsResponse, FidjApiConsentsUpdateRequest, FidjApiConsentsHistoryResponse, FidjApiUsersMeResponse, FidjApiUsersMeDetailsResponse, FidjApiUsersMeUpdateRequest, FidjApiResetPasswordRequest, FidjApiVerifyEmailRequest } from '@ofidj/contracts';
|
|
5
5
|
export declare class FidjNodeService implements IService {
|
|
6
6
|
static DEFAULT_TIMEOUT_MS: number;
|
|
7
7
|
static SANDBOX_FIDJ_ID: string;
|
|
@@ -22,6 +22,8 @@ export declare class FidjNodeService implements IService {
|
|
|
22
22
|
loginInDemoMode(options?: ModuleServiceLoginOptionsInterface): Promise<any | ErrorInterface>;
|
|
23
23
|
initAndLogin(login: string, password: string, fidjId?: string, options?: ModuleServiceInitOptionsInterface, loginOptions?: ModuleServiceLoginCallOptionsInterface): Promise<connection.ClientUser>;
|
|
24
24
|
initDemo(fidjId?: string, options?: ModuleServiceInitOptionsInterface): Promise<any>;
|
|
25
|
+
private oidcClient;
|
|
26
|
+
private oidc;
|
|
25
27
|
isLoggedIn(): boolean;
|
|
26
28
|
needsRefresh(): boolean;
|
|
27
29
|
isConnected(): Promise<boolean>;
|
|
@@ -68,6 +70,10 @@ export declare class FidjNodeService implements IService {
|
|
|
68
70
|
data?: FidjApiConsentsHistoryResponse;
|
|
69
71
|
}>;
|
|
70
72
|
fidjForgotPasswordRequest(email: string): Promise<void>;
|
|
73
|
+
resetPassword(data: FidjApiResetPasswordRequest): Promise<void>;
|
|
74
|
+
verifyEmail(data: FidjApiVerifyEmailRequest): Promise<void>;
|
|
75
|
+
resendVerification(): Promise<void>;
|
|
76
|
+
private accountPost;
|
|
71
77
|
fidjGetIdToken(): Promise<string>;
|
|
72
78
|
protected _removeAll(): Promise<void | ErrorInterface>;
|
|
73
79
|
private _loginInternal;
|
package/sdk/FidjNodeService.js
CHANGED
|
@@ -41,20 +41,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
41
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
42
|
});
|
|
43
43
|
};
|
|
44
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
45
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
|
-
};
|
|
47
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
45
|
exports.FidjNodeService = void 0;
|
|
46
|
+
const FidjOidcClient_1 = require("../identity/FidjOidcClient");
|
|
49
47
|
const tools = __importStar(require("../tools"));
|
|
50
48
|
const connection = __importStar(require("../connection"));
|
|
51
49
|
const connection_1 = require("../connection");
|
|
52
50
|
const session = __importStar(require("../session"));
|
|
53
51
|
const Interfaces_1 = require("./Interfaces");
|
|
54
52
|
const LoggerService_1 = require("./LoggerService");
|
|
55
|
-
const proper_url_join_1 = __importDefault(require("proper-url-join"));
|
|
56
53
|
const FidjError_1 = require("./FidjError");
|
|
57
54
|
const bpInfo_1 = require("../bpInfo");
|
|
55
|
+
const verifyAppSession_1 = require("../server/verifyAppSession");
|
|
58
56
|
// TODO const PouchDB = window['PouchDB'] || require('pouchdb').default;
|
|
59
57
|
class FidjNodeService {
|
|
60
58
|
constructor(logger, promise, options) {
|
|
@@ -172,8 +170,9 @@ class FidjNodeService {
|
|
|
172
170
|
yield this.connection.setConnection(clientTokens);
|
|
173
171
|
}
|
|
174
172
|
catch (err) {
|
|
175
|
-
if (err instanceof FidjError_1.FidjError)
|
|
173
|
+
if (err instanceof FidjError_1.FidjError) {
|
|
176
174
|
throw err;
|
|
175
|
+
}
|
|
177
176
|
const code = typeof (err === null || err === void 0 ? void 0 : err.code) === 'number' ? err.code : 500;
|
|
178
177
|
throw new FidjError_1.FidjError(code, (err === null || err === void 0 ? void 0 : err.toString) ? err.toString() : String(err));
|
|
179
178
|
}
|
|
@@ -245,7 +244,24 @@ class FidjNodeService {
|
|
|
245
244
|
return this.loginInDemoMode();
|
|
246
245
|
});
|
|
247
246
|
}
|
|
247
|
+
oidc() {
|
|
248
|
+
if (this.oidcClient)
|
|
249
|
+
return this.oidcClient;
|
|
250
|
+
if (typeof sessionStorage === 'undefined' || !this.connection.fidjId)
|
|
251
|
+
return undefined;
|
|
252
|
+
const saved = sessionStorage.getItem('fidj.oidc.' + this.connection.fidjId + '.config');
|
|
253
|
+
if (!saved)
|
|
254
|
+
return undefined;
|
|
255
|
+
const options = JSON.parse(saved);
|
|
256
|
+
const expectedApi = this.connection.apiEndpoint || (this.sdk.prod ? 'https://api.fidj.ovh/v3' : 'https://api.sandbox.fidj.ovh/v3');
|
|
257
|
+
if (options.apiEndpoint.replace(/\/$/, '') !== expectedApi.replace(/\/$/, '') || options.clientId !== this.connection.fidjId)
|
|
258
|
+
return undefined;
|
|
259
|
+
this.oidcClient = new FidjOidcClient_1.FidjOidcClient(Object.assign(Object.assign({}, options), { storage: sessionStorage }));
|
|
260
|
+
return this.oidcClient;
|
|
261
|
+
}
|
|
248
262
|
isLoggedIn() {
|
|
263
|
+
if (this.oidc())
|
|
264
|
+
return this.oidc().hasSession();
|
|
249
265
|
return this.connection.isLogin();
|
|
250
266
|
}
|
|
251
267
|
needsRefresh() {
|
|
@@ -287,7 +303,18 @@ class FidjNodeService {
|
|
|
287
303
|
}
|
|
288
304
|
fidjRoles() {
|
|
289
305
|
return __awaiter(this, void 0, void 0, function* () {
|
|
290
|
-
|
|
306
|
+
var _a;
|
|
307
|
+
if (!this.isLoggedIn() || ((_a = this.connection.getUser()) === null || _a === void 0 ? void 0 : _a.id) === 'demo') {
|
|
308
|
+
return JSON.parse(yield this.connection.getIdPayload({ roles: [] })).roles || [];
|
|
309
|
+
}
|
|
310
|
+
const endpoints = yield this.connection.getApiEndpoints({ filter: 'theBestOne' });
|
|
311
|
+
if (endpoints.length !== 1)
|
|
312
|
+
throw new FidjError_1.FidjError(503, 'No identity endpoint is available.');
|
|
313
|
+
const session = yield (0, verifyAppSession_1.verifyAppSession)(yield this.fidjGetIdToken(), {
|
|
314
|
+
appId: this.connection.fidjId,
|
|
315
|
+
apiEndpoint: endpoints[0].url,
|
|
316
|
+
});
|
|
317
|
+
return session.roles;
|
|
291
318
|
});
|
|
292
319
|
}
|
|
293
320
|
fidjMessage() {
|
|
@@ -297,6 +324,8 @@ class FidjNodeService {
|
|
|
297
324
|
}
|
|
298
325
|
logout(force) {
|
|
299
326
|
return __awaiter(this, void 0, void 0, function* () {
|
|
327
|
+
if (this.oidc())
|
|
328
|
+
return this.oidc().logout();
|
|
300
329
|
if (!this.connection.getClient() && !force) {
|
|
301
330
|
return this._removeAll().then(() => {
|
|
302
331
|
return this.session.create(this.connection.fidjId, true);
|
|
@@ -317,6 +346,10 @@ class FidjNodeService {
|
|
|
317
346
|
}
|
|
318
347
|
sync() {
|
|
319
348
|
return __awaiter(this, arguments, void 0, function* (options = { forceRefresh: false }) {
|
|
349
|
+
if (this.oidc()) {
|
|
350
|
+
yield this.oidc().request('/me');
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
320
353
|
this.logger.log('fidj.sdk.service.sync');
|
|
321
354
|
this.logger.log('fidj.sdk.service.sync: you ar not using DB - no sync available.');
|
|
322
355
|
try {
|
|
@@ -463,6 +496,10 @@ class FidjNodeService {
|
|
|
463
496
|
}
|
|
464
497
|
sendOnEndpoint(input) {
|
|
465
498
|
return __awaiter(this, void 0, void 0, function* () {
|
|
499
|
+
if (this.oidc()) {
|
|
500
|
+
const base = input.defaultKeyUrl ? new URL(input.defaultKeyUrl).pathname.replace(/^\/v3/, '') : '/' + (input.key || 'me');
|
|
501
|
+
return this.oidc().request(base + (input.relativePath ? '/' + input.relativePath : ''), input.verb, input.data);
|
|
502
|
+
}
|
|
466
503
|
yield this.sync();
|
|
467
504
|
const filter = input.key ? { key: input.key } : null;
|
|
468
505
|
const endpoints = yield this.fidjGetEndpoints(filter);
|
|
@@ -471,7 +508,7 @@ class FidjNodeService {
|
|
|
471
508
|
}
|
|
472
509
|
let firstEndpointUrl = !endpoints || endpoints.length !== 1 ? input.defaultKeyUrl : endpoints[0].url;
|
|
473
510
|
if (input.relativePath) {
|
|
474
|
-
firstEndpointUrl = (
|
|
511
|
+
firstEndpointUrl = new URL(input.relativePath.replace(/^\/+/, ''), firstEndpointUrl.replace(/\/?$/, '/')).href;
|
|
475
512
|
}
|
|
476
513
|
const jwt = yield this.connection.getIdToken();
|
|
477
514
|
let answer;
|
|
@@ -513,7 +550,7 @@ class FidjNodeService {
|
|
|
513
550
|
Authorization: 'Bearer ' + jwt,
|
|
514
551
|
},
|
|
515
552
|
timeout: input.timeout,
|
|
516
|
-
|
|
553
|
+
data: input.data,
|
|
517
554
|
});
|
|
518
555
|
break;
|
|
519
556
|
default:
|
|
@@ -526,7 +563,7 @@ class FidjNodeService {
|
|
|
526
563
|
Authorization: 'Bearer ' + jwt,
|
|
527
564
|
},
|
|
528
565
|
timeout: input.timeout,
|
|
529
|
-
|
|
566
|
+
data: input.data,
|
|
530
567
|
});
|
|
531
568
|
}
|
|
532
569
|
return answer;
|
|
@@ -589,25 +626,42 @@ class FidjNodeService {
|
|
|
589
626
|
}
|
|
590
627
|
fidjForgotPasswordRequest(email) {
|
|
591
628
|
return __awaiter(this, void 0, void 0, function* () {
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
yield
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
629
|
+
yield this.accountPost('/me/forgot', { email });
|
|
630
|
+
});
|
|
631
|
+
}
|
|
632
|
+
resetPassword(data) {
|
|
633
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
634
|
+
yield this.accountPost('/me/reset-password', data);
|
|
635
|
+
yield this.logout(true);
|
|
636
|
+
});
|
|
637
|
+
}
|
|
638
|
+
verifyEmail(data) {
|
|
639
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
640
|
+
yield this.accountPost('/users/verify-email', data);
|
|
641
|
+
});
|
|
642
|
+
}
|
|
643
|
+
resendVerification() {
|
|
644
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
645
|
+
yield this.sendOnEndpoint({ verb: 'POST', key: 'me', relativePath: 'resend-verification' });
|
|
646
|
+
});
|
|
647
|
+
}
|
|
648
|
+
accountPost(path, data) {
|
|
649
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
650
|
+
const endpoints = yield this.connection.getApiEndpoints({ filter: 'theBestOne' });
|
|
651
|
+
if (!endpoints || endpoints.length !== 1)
|
|
652
|
+
throw new FidjError_1.FidjError(400, 'No configured account API endpoint.');
|
|
653
|
+
yield new connection_1.Ajax().post({
|
|
654
|
+
url: endpoints[0].url.replace(/\/$/, '') + path,
|
|
655
|
+
headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
|
|
656
|
+
data,
|
|
605
657
|
timeout: FidjNodeService.DEFAULT_TIMEOUT_MS,
|
|
606
658
|
});
|
|
607
659
|
});
|
|
608
660
|
}
|
|
609
661
|
fidjGetIdToken() {
|
|
610
662
|
return __awaiter(this, void 0, void 0, function* () {
|
|
663
|
+
if (this.oidc())
|
|
664
|
+
return this.oidc().accessToken();
|
|
611
665
|
return this.connection.getIdToken();
|
|
612
666
|
});
|
|
613
667
|
}
|
|
@@ -679,4 +733,4 @@ exports.FidjNodeService = FidjNodeService;
|
|
|
679
733
|
FidjNodeService.DEFAULT_TIMEOUT_MS = 60000;
|
|
680
734
|
FidjNodeService.SANDBOX_FIDJ_ID = 'fidj-sandbox-0123fe7ed0000001';
|
|
681
735
|
FidjNodeService._srvDataUniqId = 0;
|
|
682
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FidjNodeService.js","sourceRoot":"","sources":["../../src/sdk/FidjNodeService.ts"],"names":[],"mappings":"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"}
|
|
736
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FidjNodeService.js","sourceRoot":"","sources":["../../src/sdk/FidjNodeService.ts"],"names":[],"mappings":"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"}
|
package/sdk/IService.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FidjApiResetPasswordRequest, FidjApiVerifyEmailRequest } from '@ofidj/contracts';
|
|
1
2
|
import { EndpointCallInterface, ModuleServiceInitOptionsInterface, ModuleServiceLoginCallOptionsInterface, ModuleServiceLoginOptionsInterface } from './Interfaces';
|
|
2
3
|
import { ClientUser } from '../connection';
|
|
3
4
|
import { FidjApiConsentsResponse, FidjApiConsentsUpdateRequest, FidjApiConsentsHistoryResponse, FidjApiUsersMeResponse, FidjApiUsersMeDetailsResponse, FidjApiUsersMeUpdateRequest } from '@ofidj/contracts';
|
|
@@ -11,6 +12,10 @@ export interface IService {
|
|
|
11
12
|
status: number;
|
|
12
13
|
data?: TResponse;
|
|
13
14
|
}>;
|
|
15
|
+
fidjForgotPasswordRequest(email: string): Promise<void>;
|
|
16
|
+
resetPassword(data: FidjApiResetPasswordRequest): Promise<void>;
|
|
17
|
+
verifyEmail(data: FidjApiVerifyEmailRequest): Promise<void>;
|
|
18
|
+
resendVerification(): Promise<void>;
|
|
14
19
|
getMe(): Promise<{
|
|
15
20
|
status: number;
|
|
16
21
|
data?: FidjApiUsersMeResponse;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export declare class SessionVerificationError extends Error {
|
|
2
|
+
status: 401 | 503;
|
|
3
|
+
constructor(status: 401 | 503, message: string);
|
|
4
|
+
}
|
|
5
|
+
export interface VerifiedAppSession {
|
|
6
|
+
subject: string;
|
|
7
|
+
username: string;
|
|
8
|
+
appId: string;
|
|
9
|
+
roles: string[];
|
|
10
|
+
}
|
|
11
|
+
export declare function verifyAppSession(token: string, options: {
|
|
12
|
+
appId: string;
|
|
13
|
+
apiEndpoint: string;
|
|
14
|
+
}): Promise<VerifiedAppSession>;
|
|
15
|
+
export declare function verifyOrganizationSession(token: string, options: {
|
|
16
|
+
appId: string;
|
|
17
|
+
apiEndpoint: string;
|
|
18
|
+
organizationId: string;
|
|
19
|
+
permission?: string;
|
|
20
|
+
}): Promise<{
|
|
21
|
+
organizationId: string;
|
|
22
|
+
permissions: string[];
|
|
23
|
+
subject: string;
|
|
24
|
+
username: string;
|
|
25
|
+
appId: string;
|
|
26
|
+
roles: string[];
|
|
27
|
+
}>;
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.SessionVerificationError = void 0;
|
|
13
|
+
exports.verifyAppSession = verifyAppSession;
|
|
14
|
+
exports.verifyOrganizationSession = verifyOrganizationSession;
|
|
15
|
+
const Base64_1 = require("../tools/Base64");
|
|
16
|
+
class SessionVerificationError extends Error {
|
|
17
|
+
constructor(status, message) {
|
|
18
|
+
super(message);
|
|
19
|
+
this.status = status;
|
|
20
|
+
this.name = 'SessionVerificationError';
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.SessionVerificationError = SessionVerificationError;
|
|
24
|
+
// Call on the server for each protected operation. Fidj verifies the token and
|
|
25
|
+
// stored session; role assignments are read live rather than trusted from the JWT.
|
|
26
|
+
function verifyAppSession(token, options) {
|
|
27
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
let payload;
|
|
29
|
+
try {
|
|
30
|
+
if (!token || token.length > 16384) {
|
|
31
|
+
throw new Error();
|
|
32
|
+
}
|
|
33
|
+
if (token.split('.').length !== 3) {
|
|
34
|
+
payload = null;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
const encoded = token.split('.')[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
38
|
+
payload = JSON.parse(Base64_1.Base64.decode(encoded.padEnd(Math.ceil(encoded.length / 4) * 4, '=')));
|
|
39
|
+
if (payload.aud !== options.appId ||
|
|
40
|
+
typeof payload.sub !== 'string' ||
|
|
41
|
+
typeof payload.name !== 'string') {
|
|
42
|
+
throw new Error();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch (_a) {
|
|
47
|
+
throw new SessionVerificationError(401, 'Sign in to this app.');
|
|
48
|
+
}
|
|
49
|
+
let response;
|
|
50
|
+
try {
|
|
51
|
+
response = yield fetch(`${options.apiEndpoint.replace(/\/$/, '')}/apps/${encodeURIComponent(options.appId)}/me`, {
|
|
52
|
+
headers: { Authorization: `Bearer ${token}`, Accept: 'application/json' },
|
|
53
|
+
signal: AbortSignal.timeout(5000),
|
|
54
|
+
redirect: 'error',
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
catch (_b) {
|
|
58
|
+
throw new SessionVerificationError(503, 'Identity service unavailable. Please retry.');
|
|
59
|
+
}
|
|
60
|
+
if ([401, 403, 404].includes(response.status)) {
|
|
61
|
+
throw new SessionVerificationError(401, 'Session expired or revoked. Sign in again.');
|
|
62
|
+
}
|
|
63
|
+
if (!response.ok) {
|
|
64
|
+
throw new SessionVerificationError(503, 'Identity service unavailable. Please retry.');
|
|
65
|
+
}
|
|
66
|
+
let result;
|
|
67
|
+
try {
|
|
68
|
+
result = yield response.json();
|
|
69
|
+
if (!Array.isArray(result.roles) ||
|
|
70
|
+
result.roles.some((role) => typeof role.type !== 'string')) {
|
|
71
|
+
throw new Error();
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (_c) {
|
|
75
|
+
throw new SessionVerificationError(503, 'Invalid identity-service response.');
|
|
76
|
+
}
|
|
77
|
+
if (!payload && (typeof result.subject !== 'string' || result.appId !== options.appId))
|
|
78
|
+
throw new SessionVerificationError(401, 'App session scope mismatch.');
|
|
79
|
+
return {
|
|
80
|
+
subject: (payload === null || payload === void 0 ? void 0 : payload.sub) || result.subject,
|
|
81
|
+
username: (payload === null || payload === void 0 ? void 0 : payload.name) || result.username,
|
|
82
|
+
appId: options.appId,
|
|
83
|
+
roles: result.roles.map((role) => role.type),
|
|
84
|
+
};
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
function verifyOrganizationSession(token, options) {
|
|
88
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
89
|
+
var _a, _b;
|
|
90
|
+
const session = yield verifyAppSession(token, options);
|
|
91
|
+
let response;
|
|
92
|
+
try {
|
|
93
|
+
response = yield fetch(`${options.apiEndpoint.replace(/\/$/, '')}/apps/${encodeURIComponent(options.appId)}/organizations/${encodeURIComponent(options.organizationId)}`, { headers: { Authorization: `Bearer ${token}` }, redirect: 'error', signal: AbortSignal.timeout(5000) });
|
|
94
|
+
}
|
|
95
|
+
catch (_c) {
|
|
96
|
+
throw new SessionVerificationError(503, 'Identity service unavailable.');
|
|
97
|
+
}
|
|
98
|
+
if (!response.ok)
|
|
99
|
+
throw new SessionVerificationError(response.status >= 500 ? 503 : 401, 'Organization access denied.');
|
|
100
|
+
const result = yield response.json();
|
|
101
|
+
if (((_a = result.organization) === null || _a === void 0 ? void 0 : _a.id) !== options.organizationId || !Array.isArray((_b = result.access) === null || _b === void 0 ? void 0 : _b.permissions) || (options.permission && !result.access.permissions.includes(options.permission)))
|
|
102
|
+
throw new SessionVerificationError(401, 'Organization permission denied.');
|
|
103
|
+
return Object.assign(Object.assign({}, session), { organizationId: options.organizationId, permissions: result.access.permissions });
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyaWZ5QXBwU2Vzc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2ZXIvdmVyaWZ5QXBwU2Vzc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFzQkEsNENBNkRDO0FBRUQsOERBUUM7QUE3RkQsNENBQXVDO0FBR3ZDLE1BQWEsd0JBQXlCLFNBQVEsS0FBSztJQUMvQyxZQUNXLE1BQWlCLEVBQ3hCLE9BQWU7UUFFZixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFIUixXQUFNLEdBQU4sTUFBTSxDQUFXO1FBSXhCLElBQUksQ0FBQyxJQUFJLEdBQUcsMEJBQTBCLENBQUM7SUFDM0MsQ0FBQztDQUNKO0FBUkQsNERBUUM7QUFTRCwrRUFBK0U7QUFDL0UsbUZBQW1GO0FBQ25GLFNBQXNCLGdCQUFnQixDQUNsQyxLQUFhLEVBQ2IsT0FBNkM7O1FBRTdDLElBQUksT0FBWSxDQUFDO1FBQ2pCLElBQUksQ0FBQztZQUNELElBQUksQ0FBQyxLQUFLLElBQUksS0FBSyxDQUFDLE1BQU0sR0FBRyxLQUFLLEVBQUUsQ0FBQztnQkFDakMsTUFBTSxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ3RCLENBQUM7WUFDRCxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO2dCQUFBLE9BQU8sR0FBRyxJQUFJLENBQUM7WUFBQSxDQUFDO2lCQUFNLENBQUM7Z0JBQzNELE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO2dCQUMxRSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMs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
|