@idp.global/sdk 10.0.0 → 11.0.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.
- package/changelog.md +13 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_browser/classes.idpclient.d.ts +7 -5
- package/dist_ts_browser/classes.idpclient.js +32 -36
- package/dist_ts_server/classes.idp-global-server-client.d.ts +0 -3
- package/dist_ts_server/classes.idp-global-server-client.js +5 -25
- package/package.json +9 -9
- package/readme.md +25 -22
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_browser/classes.idpclient.ts +41 -34
- package/ts_server/classes.idp-global-server-client.ts +7 -27
package/changelog.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-16 - 11.0.0
|
|
4
|
+
|
|
5
|
+
### Breaking Changes
|
|
6
|
+
|
|
7
|
+
- adopt `@idp.global/interfaces` 13 so SDK activity request responses expose only structured, finite, privacy-safe event classifications
|
|
8
|
+
- remove the singular JWT verification-key fetch and push APIs; backend integrations now use only `getPublicKeysForValidation`, `pushPublicKeysForValidation`, and complete keysets
|
|
9
|
+
- replace browser app metadata in transfer flows with the minimal `transferTarget: { appUrl }` contract, including the `transfertarget` login query parameter
|
|
10
|
+
- reject malformed, non-HTTPS, and credential-bearing transfer targets; bind token requests and navigation to the same immutable target and remove URL-derived logout redirects
|
|
11
|
+
|
|
12
|
+
### Maintenance
|
|
13
|
+
|
|
14
|
+
- update typed request/socket, smartdata, smartrx, webstore, smartdb, and Node.js type dependencies before release
|
|
15
|
+
|
|
3
16
|
## 2026-07-11 - 10.0.0
|
|
4
17
|
|
|
5
18
|
### Breaking Changes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@idp.global/sdk',
|
|
6
|
-
version: '
|
|
6
|
+
version: '11.0.0',
|
|
7
7
|
description: 'Reusable browser and server SDK for idp.global authentication.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxpQkFBaUI7SUFDdkIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdFQUFnRTtDQUM5RSxDQUFBIn0=
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { IdpRequests } from './classes.idprequests.js';
|
|
2
2
|
import * as plugins from './plugins.js';
|
|
3
3
|
export declare class IdpClient {
|
|
4
|
+
#private;
|
|
4
5
|
private helpers;
|
|
5
|
-
appData: plugins.idpInterfaces.data.IAppLegacy;
|
|
6
6
|
rolesReplaySubject: plugins.smartrx.rxjs.ReplaySubject<unknown>;
|
|
7
7
|
organizationsReplaySubject: plugins.smartrx.rxjs.ReplaySubject<unknown>;
|
|
8
8
|
parsedReceptionUrl: plugins.smarturl.Smarturl;
|
|
9
|
-
constructor(receptionBaseUrlArg: string,
|
|
9
|
+
constructor(receptionBaseUrlArg: string, transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget);
|
|
10
|
+
get transferTarget(): Readonly<plugins.idpInterfaces.data.ITransferTarget>;
|
|
10
11
|
requests: IdpRequests;
|
|
11
12
|
checkWetherOnReceptionDomain(): boolean;
|
|
12
|
-
|
|
13
|
+
private normalizeTransferTargetAppUrl;
|
|
13
14
|
setJwt(jwtStringArg: string): Promise<void>;
|
|
14
15
|
setRefreshToken(refreshTokenArg: string): Promise<void>;
|
|
15
16
|
typedsocket: plugins.typedsocket.TypedSocket;
|
|
@@ -28,8 +29,9 @@ export declare class IdpClient {
|
|
|
28
29
|
refreshJwt(refreshTokenArg?: string): Promise<string | null>;
|
|
29
30
|
private isAuthInvalidResponse;
|
|
30
31
|
private validateJwtWithServer;
|
|
31
|
-
getTransferToken(
|
|
32
|
-
|
|
32
|
+
getTransferToken(): Promise<string | null>;
|
|
33
|
+
private getTransferTokenForTarget;
|
|
34
|
+
getTransferTokenAndSwitchToLocation(): Promise<void>;
|
|
33
35
|
private scrubTransferTokenFromCurrentUrl;
|
|
34
36
|
processTransferToken(): Promise<boolean>;
|
|
35
37
|
checkJwtPresent(): Promise<boolean>;
|
|
@@ -6,11 +6,11 @@ export class IdpClient {
|
|
|
6
6
|
return plugins.webjwt.getDataFromJwtString(jwtString);
|
|
7
7
|
},
|
|
8
8
|
};
|
|
9
|
-
|
|
9
|
+
#transferTargetAppUrl;
|
|
10
10
|
rolesReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
|
|
11
11
|
organizationsReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
|
|
12
12
|
parsedReceptionUrl;
|
|
13
|
-
constructor(receptionBaseUrlArg,
|
|
13
|
+
constructor(receptionBaseUrlArg, transferTargetArg) {
|
|
14
14
|
if (receptionBaseUrlArg.endsWith('/')) {
|
|
15
15
|
receptionBaseUrlArg = receptionBaseUrlArg.slice(0, -1);
|
|
16
16
|
}
|
|
@@ -18,34 +18,30 @@ export class IdpClient {
|
|
|
18
18
|
receptionBaseUrlArg = `${receptionBaseUrlArg}/typedrequest`;
|
|
19
19
|
}
|
|
20
20
|
this.parsedReceptionUrl = plugins.smarturl.Smarturl.createFromUrl(receptionBaseUrlArg);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
name: '',
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
this.appData = appDataArg;
|
|
21
|
+
this.#transferTargetAppUrl = this.normalizeTransferTargetAppUrl(transferTargetArg || {
|
|
22
|
+
appUrl: typeof window !== 'undefined' ? window.location.origin : '',
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
get transferTarget() {
|
|
26
|
+
return Object.freeze({ appUrl: this.#transferTargetAppUrl });
|
|
31
27
|
}
|
|
32
28
|
requests = new IdpRequests(this);
|
|
33
29
|
checkWetherOnReceptionDomain() {
|
|
34
30
|
return plugins.smarturl.Smarturl.createFromUrl(window.location.href).hostname ===
|
|
35
31
|
this.parsedReceptionUrl.hostname;
|
|
36
32
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
33
|
+
normalizeTransferTargetAppUrl(transferTargetArg) {
|
|
34
|
+
let appUrl;
|
|
35
|
+
try {
|
|
36
|
+
appUrl = new URL(transferTargetArg.appUrl);
|
|
41
37
|
}
|
|
42
|
-
|
|
43
|
-
.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
38
|
+
catch {
|
|
39
|
+
throw new Error('transferTarget.appUrl must be an absolute HTTPS URL');
|
|
40
|
+
}
|
|
41
|
+
if (appUrl.protocol !== 'https:' || appUrl.username || appUrl.password) {
|
|
42
|
+
throw new Error('transferTarget.appUrl must be a credential-free HTTPS URL');
|
|
47
43
|
}
|
|
48
|
-
return
|
|
44
|
+
return appUrl.toString();
|
|
49
45
|
}
|
|
50
46
|
async setJwt(jwtStringArg) {
|
|
51
47
|
await this.storeJwt(jwtStringArg);
|
|
@@ -148,7 +144,10 @@ export class IdpClient {
|
|
|
148
144
|
throw error;
|
|
149
145
|
}
|
|
150
146
|
}
|
|
151
|
-
async getTransferToken(
|
|
147
|
+
async getTransferToken() {
|
|
148
|
+
return this.getTransferTokenForTarget(this.transferTarget);
|
|
149
|
+
}
|
|
150
|
+
async getTransferTokenForTarget(transferTargetArg) {
|
|
152
151
|
await this.performJwtHousekeeping();
|
|
153
152
|
const refreshToken = await this.getRefreshToken();
|
|
154
153
|
if (!refreshToken) {
|
|
@@ -158,16 +157,17 @@ export class IdpClient {
|
|
|
158
157
|
const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
|
|
159
158
|
const response = await getTransferToken.fire({
|
|
160
159
|
refreshToken,
|
|
161
|
-
|
|
160
|
+
transferTarget: transferTargetArg,
|
|
162
161
|
});
|
|
163
162
|
return response.transferToken;
|
|
164
163
|
}
|
|
165
|
-
async getTransferTokenAndSwitchToLocation(
|
|
166
|
-
const
|
|
164
|
+
async getTransferTokenAndSwitchToLocation() {
|
|
165
|
+
const transferTarget = this.transferTarget;
|
|
166
|
+
const transferToken = await this.getTransferTokenForTarget(transferTarget);
|
|
167
167
|
if (!transferToken) {
|
|
168
|
-
|
|
168
|
+
throw new Error('IdP did not return a transfer token');
|
|
169
169
|
}
|
|
170
|
-
const urlInstance = plugins.smarturl.Smarturl.createFromUrl(
|
|
170
|
+
const urlInstance = plugins.smarturl.Smarturl.createFromUrl(transferTarget.appUrl, {
|
|
171
171
|
searchParams: { transfertoken: transferToken },
|
|
172
172
|
});
|
|
173
173
|
window.location.href = urlInstance.toString();
|
|
@@ -193,7 +193,7 @@ export class IdpClient {
|
|
|
193
193
|
const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
|
|
194
194
|
const response = await getTransferToken.fire({
|
|
195
195
|
transferToken,
|
|
196
|
-
|
|
196
|
+
transferTarget: this.transferTarget,
|
|
197
197
|
});
|
|
198
198
|
if (response.refreshToken) {
|
|
199
199
|
await this.refreshJwt(response.refreshToken);
|
|
@@ -232,7 +232,7 @@ export class IdpClient {
|
|
|
232
232
|
if (requireLoginArg) {
|
|
233
233
|
const urlInstance = plugins.smarturl.Smarturl.createFromUrl(this.parsedReceptionUrl.clone().set('path', '/login').toString(), {
|
|
234
234
|
searchParams: {
|
|
235
|
-
|
|
235
|
+
transfertarget: plugins.smartjson.stringifyBase64(this.transferTarget),
|
|
236
236
|
},
|
|
237
237
|
});
|
|
238
238
|
if (!globalThis.location.href.startsWith(this.parsedReceptionUrl.toString())) {
|
|
@@ -292,11 +292,7 @@ export class IdpClient {
|
|
|
292
292
|
if (!redirect) {
|
|
293
293
|
return;
|
|
294
294
|
}
|
|
295
|
-
|
|
296
|
-
if (appData) {
|
|
297
|
-
window.location.href = appData.appUrl;
|
|
298
|
-
}
|
|
299
|
-
else if (window.location.href.startsWith(idpLogoutUrl.origin)) {
|
|
295
|
+
if (window.location.href.startsWith(idpLogoutUrl.origin)) {
|
|
300
296
|
window.location.href = this.parsedReceptionUrl.origin;
|
|
301
297
|
}
|
|
302
298
|
}
|
|
@@ -373,4 +369,4 @@ export class IdpClient {
|
|
|
373
369
|
return whoIs.fire({ jwt: await this.getJwt() });
|
|
374
370
|
}
|
|
375
371
|
}
|
|
376
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}
|
|
372
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,6 @@ export declare class IdpGlobalServerClient {
|
|
|
22
22
|
private typedrouter;
|
|
23
23
|
private typedsocket?;
|
|
24
24
|
private typedsocketDeferred;
|
|
25
|
-
private publicKeyPushHandlers;
|
|
26
25
|
private publicKeysPushHandlers;
|
|
27
26
|
private blocklistPushHandlers;
|
|
28
27
|
private connectionGeneration;
|
|
@@ -33,11 +32,9 @@ export declare class IdpGlobalServerClient {
|
|
|
33
32
|
constructor(optionsArg?: IIdpGlobalServerClientOptions);
|
|
34
33
|
connect(): Promise<plugins.typedsocket.TypedSocket>;
|
|
35
34
|
stop(): Promise<void>;
|
|
36
|
-
onPublicKeyPush(handlerArg: (publicKeyPemArg: string) => void | Promise<void>): () => void;
|
|
37
35
|
onPublicKeysPush(handlerArg: (publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]) => void | Promise<void>): () => void;
|
|
38
36
|
onBlocklistPush(handlerArg: (blockedJwtIdsArg: string[]) => void | Promise<void>): () => void;
|
|
39
37
|
registerBackendService(backendTokenArg?: string): Promise<void>;
|
|
40
|
-
getPublicKeyForValidation(backendTokenArg?: string): Promise<string>;
|
|
41
38
|
getPublicKeysForValidation(backendTokenArg?: string): Promise<plugins.idpInterfaces.data.IJwtVerificationKey[]>;
|
|
42
39
|
getJwtIdBlocklist(backendTokenArg?: string): Promise<string[]>;
|
|
43
40
|
loginWithEmailAndPassword(optionsArg: {
|
|
@@ -15,7 +15,6 @@ export class IdpGlobalServerClient {
|
|
|
15
15
|
typedrouter = new plugins.typedrequest.TypedRouter();
|
|
16
16
|
typedsocket;
|
|
17
17
|
typedsocketDeferred = this.createConnectionDeferred();
|
|
18
|
-
publicKeyPushHandlers = [];
|
|
19
18
|
publicKeysPushHandlers = [];
|
|
20
19
|
blocklistPushHandlers = [];
|
|
21
20
|
connectionGeneration = 0;
|
|
@@ -25,14 +24,8 @@ export class IdpGlobalServerClient {
|
|
|
25
24
|
stopping = false;
|
|
26
25
|
constructor(optionsArg = {}) {
|
|
27
26
|
this.optionsArg = optionsArg;
|
|
28
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('
|
|
29
|
-
|
|
30
|
-
await Promise.all([
|
|
31
|
-
...this.publicKeyPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeyPem)),
|
|
32
|
-
...publicKeys.length
|
|
33
|
-
? this.publicKeysPushHandlers.map((handlerArg) => handlerArg(publicKeys))
|
|
34
|
-
: [],
|
|
35
|
-
]);
|
|
27
|
+
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('pushPublicKeysForValidation', async (requestArg) => {
|
|
28
|
+
await Promise.all(this.publicKeysPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeys)));
|
|
36
29
|
return {};
|
|
37
30
|
}));
|
|
38
31
|
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('pushOrGetJwtIdBlocklist', async (requestArg) => {
|
|
@@ -115,12 +108,6 @@ export class IdpGlobalServerClient {
|
|
|
115
108
|
this.pendingSocketPromise = undefined;
|
|
116
109
|
this.stopping = false;
|
|
117
110
|
}
|
|
118
|
-
onPublicKeyPush(handlerArg) {
|
|
119
|
-
this.publicKeyPushHandlers.push(handlerArg);
|
|
120
|
-
return () => {
|
|
121
|
-
this.publicKeyPushHandlers = this.publicKeyPushHandlers.filter((handler) => handler !== handlerArg);
|
|
122
|
-
};
|
|
123
|
-
}
|
|
124
111
|
onPublicKeysPush(handlerArg) {
|
|
125
112
|
this.publicKeysPushHandlers.push(handlerArg);
|
|
126
113
|
return () => {
|
|
@@ -138,20 +125,13 @@ export class IdpGlobalServerClient {
|
|
|
138
125
|
const socket = await this.connect();
|
|
139
126
|
await this.applyBackendServiceTag(socket, backendToken);
|
|
140
127
|
}
|
|
141
|
-
async getPublicKeyForValidation(backendTokenArg = this.optionsArg.backendToken) {
|
|
142
|
-
const backendToken = this.requireBackendToken(backendTokenArg);
|
|
143
|
-
const socket = await this.connect();
|
|
144
|
-
const request = socket.createTypedRequest('getPublicKeyForValidation');
|
|
145
|
-
const response = await this.raceWithStop(request.fire({ backendToken }));
|
|
146
|
-
return response.publicKeyPem;
|
|
147
|
-
}
|
|
148
128
|
async getPublicKeysForValidation(backendTokenArg = this.optionsArg.backendToken) {
|
|
149
129
|
const backendToken = this.requireBackendToken(backendTokenArg);
|
|
150
130
|
const socket = await this.connect();
|
|
151
|
-
const request = socket.createTypedRequest('
|
|
131
|
+
const request = socket.createTypedRequest('getPublicKeysForValidation');
|
|
152
132
|
const response = await this.raceWithStop(request.fire({ backendToken }));
|
|
153
133
|
if (!Array.isArray(response.publicKeys) || response.publicKeys.length === 0) {
|
|
154
|
-
throw new Error('IdP
|
|
134
|
+
throw new Error('IdP returned an invalid JWT verification key set.');
|
|
155
135
|
}
|
|
156
136
|
return response.publicKeys;
|
|
157
137
|
}
|
|
@@ -237,4 +217,4 @@ export class IdpGlobalServerClient {
|
|
|
237
217
|
this.stopWaiters.clear();
|
|
238
218
|
}
|
|
239
219
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idp-global-server-client.js","sourceRoot":"","sources":["../ts_server/classes.idp-global-server-client.ts"],"names":[],"mappings":"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"}
|
|
220
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idp-global-server-client.js","sourceRoot":"","sources":["../ts_server/classes.idp-global-server-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@idp.global/sdk",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Reusable browser and server SDK for idp.global authentication.",
|
|
6
6
|
"type": "module",
|
|
@@ -14,25 +14,25 @@
|
|
|
14
14
|
"author": "Task Venture Capital GmbH",
|
|
15
15
|
"license": "MIT",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@api.global/typedrequest": "^3.3.
|
|
18
|
-
"@api.global/typedsocket": "^4.2.
|
|
19
|
-
"@idp.global/interfaces": "^
|
|
20
|
-
"@push.rocks/smartdata": "^7.1
|
|
17
|
+
"@api.global/typedrequest": "^3.3.2",
|
|
18
|
+
"@api.global/typedsocket": "^4.2.5",
|
|
19
|
+
"@idp.global/interfaces": "^13.1.0",
|
|
20
|
+
"@push.rocks/smartdata": "^7.2.1",
|
|
21
21
|
"@push.rocks/smartjson": "^6.0.1",
|
|
22
22
|
"@push.rocks/smartpromise": "^4.2.4",
|
|
23
|
-
"@push.rocks/smartrx": "^3.0.
|
|
23
|
+
"@push.rocks/smartrx": "^3.0.12",
|
|
24
24
|
"@push.rocks/smarttime": "^4.2.3",
|
|
25
25
|
"@push.rocks/smarturl": "^3.1.0",
|
|
26
26
|
"@push.rocks/webjwt": "^1.0.10",
|
|
27
|
-
"@push.rocks/webstore": "^2.0.
|
|
27
|
+
"@push.rocks/webstore": "^2.0.23"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@git.zone/tsbuild": "^4.4.2",
|
|
31
31
|
"@git.zone/tsdoc": "^2.1.1",
|
|
32
32
|
"@git.zone/tsrun": "^2.0.5",
|
|
33
33
|
"@git.zone/tstest": "^3.6.6",
|
|
34
|
-
"@push.rocks/smartdb": "^2.
|
|
35
|
-
"@types/node": "^26.1.
|
|
34
|
+
"@push.rocks/smartdb": "^2.12.2",
|
|
35
|
+
"@types/node": "^26.1.1"
|
|
36
36
|
},
|
|
37
37
|
"files": [
|
|
38
38
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -34,11 +34,7 @@ import { IdpClient } from '@idp.global/sdk/browser';
|
|
|
34
34
|
Create one client per app shell. The `receptionBaseUrl` may be the SSO origin or the full typedrequest URL; the SDK normalizes it to `/typedrequest` internally.
|
|
35
35
|
|
|
36
36
|
```ts
|
|
37
|
-
const idp = new IdpClient('https://
|
|
38
|
-
id: 'my-app',
|
|
39
|
-
name: 'My App',
|
|
40
|
-
description: 'The app your users actually want to open.',
|
|
41
|
-
logoUrl: 'https://app.example.com/logo.svg',
|
|
37
|
+
const idp = new IdpClient('https://idp.global', {
|
|
42
38
|
appUrl: 'https://app.example.com/',
|
|
43
39
|
});
|
|
44
40
|
|
|
@@ -51,7 +47,7 @@ if (loggedIn) {
|
|
|
51
47
|
}
|
|
52
48
|
```
|
|
53
49
|
|
|
54
|
-
When `determineLoginStatus(true)` cannot recover a valid JWT from browser storage, a refresh token, or a `transfertoken` query parameter, it redirects the user to the configured idp.global login route with
|
|
50
|
+
When `determineLoginStatus(true)` cannot recover a valid JWT from browser storage, a refresh token, or a `transfertoken` query parameter, it redirects the user to the configured idp.global login route with the minimal `{ appUrl }` transfer target encoded as `transfertarget`.
|
|
55
51
|
|
|
56
52
|
### Token Handling
|
|
57
53
|
|
|
@@ -94,29 +90,30 @@ if (loginResponse.refreshToken) {
|
|
|
94
90
|
Transfer tokens are the handoff mechanism for moving a logged-in user between apps without exposing refresh tokens to URLs.
|
|
95
91
|
|
|
96
92
|
```ts
|
|
97
|
-
|
|
98
|
-
if (transferToken) {
|
|
99
|
-
const target = new URL('https://another-app.example.com/');
|
|
100
|
-
target.searchParams.set('transfertoken', transferToken);
|
|
101
|
-
window.location.href = target.toString();
|
|
102
|
-
}
|
|
93
|
+
await idp.getTransferTokenAndSwitchToLocation();
|
|
103
94
|
```
|
|
104
95
|
|
|
105
96
|
On the receiving app, `determineLoginStatus()` calls `processTransferToken()` as part of its normal recovery flow. You can also call `processTransferToken()` directly when you own the route handling.
|
|
106
97
|
|
|
98
|
+
The SDK accepts only absolute, credential-free HTTPS transfer targets and uses
|
|
99
|
+
the same configured target for token exchange and navigation. The
|
|
100
|
+
`transfertarget` query value is a request, not proof of authorization: the IdP
|
|
101
|
+
must match it against an exact registered redirect target and bind it to the
|
|
102
|
+
single-use transfer token before issuing that token.
|
|
103
|
+
|
|
107
104
|
### Logout
|
|
108
105
|
|
|
109
106
|
```ts
|
|
110
107
|
await idp.logout();
|
|
111
108
|
```
|
|
112
109
|
|
|
113
|
-
`logout()` clears local auth state and, when a refresh token is available on the
|
|
110
|
+
`logout()` clears local auth state and, when a refresh token is available on the IdP origin, asks idp.global to revoke the session before returning to the IdP origin. It never navigates to a URL-derived transfer target.
|
|
114
111
|
|
|
115
112
|
### Browser API Surface
|
|
116
113
|
|
|
117
114
|
| API | Description |
|
|
118
115
|
| --- | --- |
|
|
119
|
-
| `new IdpClient(receptionBaseUrl,
|
|
116
|
+
| `new IdpClient(receptionBaseUrl, transferTarget?)` | Configure an idp.global browser client with a minimal `{ appUrl }` return target. |
|
|
120
117
|
| `enableTypedSocket()` / `stop()` | Start or stop the typed-socket connection. |
|
|
121
118
|
| `determineLoginStatus(requireLogin?)` | Resolve login state from JWT, refresh token, transfer token, or optional redirect. |
|
|
122
119
|
| `statusObservable` | RxJS subject that emits idp.global login status changes during refresh flows. |
|
|
@@ -124,8 +121,8 @@ await idp.logout();
|
|
|
124
121
|
| `getRolesAndOrganizations()` | Fetch roles and organizations for the current user. |
|
|
125
122
|
| `createOrganization(name, slug, mode)` | Check organization slug availability or manifest an organization. |
|
|
126
123
|
| `updatePaddleCheckoutId(orgId, checkoutId)` | Send a Paddle checkout ID as the org payment method update. |
|
|
127
|
-
| `getTransferToken(
|
|
128
|
-
| `getTransferTokenAndSwitchToLocation(
|
|
124
|
+
| `getTransferToken()` | Request a transfer token for the configured transfer target. |
|
|
125
|
+
| `getTransferTokenAndSwitchToLocation()` | Request a transfer token and navigate to the same configured target with `transfertoken` attached. |
|
|
129
126
|
| `processTransferToken()` | Consume a `transfertoken` from the current URL and refresh local auth state. |
|
|
130
127
|
| `logout()` | Revoke and clear the current login flow. |
|
|
131
128
|
|
|
@@ -133,11 +130,18 @@ await idp.logout();
|
|
|
133
130
|
|
|
134
131
|
`idp.requests` exposes typed request factories backed by `@idp.global/interfaces`. The request and response payload types come from that package, so your editor can guide exact payload shapes.
|
|
135
132
|
|
|
136
|
-
SDK
|
|
133
|
+
SDK 11 adopts interfaces v13. JWT verification-key distribution is keyset-only
|
|
134
|
+
and uses the plural `getPublicKeysForValidation` and
|
|
135
|
+
`pushPublicKeysForValidation` contracts. Transfer-token exchange accepts only
|
|
136
|
+
the minimal `transferTarget: { appUrl }` destination. OIDC app creation requires explicit client
|
|
137
137
|
type, grant types, callback and post-logout URIs, and token lifetime settings.
|
|
138
138
|
Public clients do not receive a client secret; confidential client secrets are
|
|
139
139
|
returned only once when created or rotated. The unsupported
|
|
140
|
-
`client_credentials` grant and
|
|
140
|
+
`client_credentials` grant and API-token login are not exposed.
|
|
141
|
+
`getUserActivity` and `exportUserActivity` return structured activity events
|
|
142
|
+
with finite action, outcome, target-type, reason-code, and allowlisted-fact
|
|
143
|
+
fields; persistence IDs, free text, network data, integrity material, and sink
|
|
144
|
+
delivery state are not part of the SDK contract.
|
|
141
145
|
|
|
142
146
|
| Area | Request getters |
|
|
143
147
|
| --- | --- |
|
|
@@ -260,9 +264,8 @@ const publicKeys = await idpClient.getPublicKeysForValidation();
|
|
|
260
264
|
const blockedJwtIds = await idpClient.getJwtIdBlocklist();
|
|
261
265
|
```
|
|
262
266
|
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
select by the JWT header `kid`, and reject unknown key IDs.
|
|
267
|
+
Verification is keyset-only. Replace the cached snapshot on every push, select
|
|
268
|
+
the verification key by the JWT header `kid`, and reject unknown key IDs.
|
|
266
269
|
|
|
267
270
|
### Server API Surface
|
|
268
271
|
|
|
@@ -310,7 +313,7 @@ The SDK uses typed sockets and typed requests from `@api.global/*`, shared idp.g
|
|
|
310
313
|
pnpm test
|
|
311
314
|
```
|
|
312
315
|
|
|
313
|
-
The test suite covers the server account store and auth service, browser transfer-token handling, typed administrative request names, and backend JWT
|
|
316
|
+
The test suite covers the server account store and auth service, browser transfer-token handling, typed administrative request names, and the exact backend JWT keyset and blocklist contracts.
|
|
314
317
|
|
|
315
318
|
## License and Legal Information
|
|
316
319
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -8,13 +8,16 @@ export class IdpClient {
|
|
|
8
8
|
},
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
readonly #transferTargetAppUrl: string;
|
|
12
12
|
public rolesReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
|
|
13
13
|
public organizationsReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
|
|
14
14
|
|
|
15
15
|
public parsedReceptionUrl: plugins.smarturl.Smarturl;
|
|
16
16
|
|
|
17
|
-
constructor(
|
|
17
|
+
constructor(
|
|
18
|
+
receptionBaseUrlArg: string,
|
|
19
|
+
transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget
|
|
20
|
+
) {
|
|
18
21
|
if (receptionBaseUrlArg.endsWith('/')) {
|
|
19
22
|
receptionBaseUrlArg = receptionBaseUrlArg.slice(0, -1);
|
|
20
23
|
}
|
|
@@ -22,16 +25,15 @@ export class IdpClient {
|
|
|
22
25
|
receptionBaseUrlArg = `${receptionBaseUrlArg}/typedrequest`;
|
|
23
26
|
}
|
|
24
27
|
this.parsedReceptionUrl = plugins.smarturl.Smarturl.createFromUrl(receptionBaseUrlArg);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
this.appData = appDataArg;
|
|
28
|
+
this.#transferTargetAppUrl = this.normalizeTransferTargetAppUrl(
|
|
29
|
+
transferTargetArg || {
|
|
30
|
+
appUrl: typeof window !== 'undefined' ? window.location.origin : '',
|
|
31
|
+
}
|
|
32
|
+
);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
public get transferTarget(): Readonly<plugins.idpInterfaces.data.ITransferTarget> {
|
|
36
|
+
return Object.freeze({ appUrl: this.#transferTargetAppUrl });
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
public requests = new IdpRequests(this);
|
|
@@ -41,18 +43,19 @@ export class IdpClient {
|
|
|
41
43
|
this.parsedReceptionUrl.hostname;
|
|
42
44
|
}
|
|
43
45
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
private normalizeTransferTargetAppUrl(
|
|
47
|
+
transferTargetArg: plugins.idpInterfaces.data.ITransferTarget
|
|
48
|
+
): string {
|
|
49
|
+
let appUrl: URL;
|
|
50
|
+
try {
|
|
51
|
+
appUrl = new URL(transferTargetArg.appUrl);
|
|
52
|
+
} catch {
|
|
53
|
+
throw new Error('transferTarget.appUrl must be an absolute HTTPS URL');
|
|
48
54
|
}
|
|
49
|
-
|
|
50
|
-
.
|
|
51
|
-
if (!appDataString) {
|
|
52
|
-
console.error('no appdata query arg detected');
|
|
53
|
-
return null;
|
|
55
|
+
if (appUrl.protocol !== 'https:' || appUrl.username || appUrl.password) {
|
|
56
|
+
throw new Error('transferTarget.appUrl must be a credential-free HTTPS URL');
|
|
54
57
|
}
|
|
55
|
-
return
|
|
58
|
+
return appUrl.toString();
|
|
56
59
|
}
|
|
57
60
|
|
|
58
61
|
public async setJwt(jwtStringArg: string) {
|
|
@@ -174,7 +177,13 @@ export class IdpClient {
|
|
|
174
177
|
}
|
|
175
178
|
}
|
|
176
179
|
|
|
177
|
-
public async getTransferToken(
|
|
180
|
+
public async getTransferToken(): Promise<string | null> {
|
|
181
|
+
return this.getTransferTokenForTarget(this.transferTarget);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
private async getTransferTokenForTarget(
|
|
185
|
+
transferTargetArg: Readonly<plugins.idpInterfaces.data.ITransferTarget>
|
|
186
|
+
): Promise<string | null> {
|
|
178
187
|
await this.performJwtHousekeeping();
|
|
179
188
|
const refreshToken = await this.getRefreshToken();
|
|
180
189
|
if (!refreshToken) {
|
|
@@ -184,17 +193,18 @@ export class IdpClient {
|
|
|
184
193
|
const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
|
|
185
194
|
const response = await getTransferToken.fire({
|
|
186
195
|
refreshToken,
|
|
187
|
-
|
|
196
|
+
transferTarget: transferTargetArg,
|
|
188
197
|
});
|
|
189
198
|
return response.transferToken;
|
|
190
199
|
}
|
|
191
200
|
|
|
192
|
-
public async getTransferTokenAndSwitchToLocation(
|
|
193
|
-
const
|
|
201
|
+
public async getTransferTokenAndSwitchToLocation(): Promise<void> {
|
|
202
|
+
const transferTarget = this.transferTarget;
|
|
203
|
+
const transferToken = await this.getTransferTokenForTarget(transferTarget);
|
|
194
204
|
if (!transferToken) {
|
|
195
|
-
|
|
205
|
+
throw new Error('IdP did not return a transfer token');
|
|
196
206
|
}
|
|
197
|
-
const urlInstance = plugins.smarturl.Smarturl.createFromUrl(
|
|
207
|
+
const urlInstance = plugins.smarturl.Smarturl.createFromUrl(transferTarget.appUrl, {
|
|
198
208
|
searchParams: { transfertoken: transferToken },
|
|
199
209
|
});
|
|
200
210
|
window.location.href = urlInstance.toString();
|
|
@@ -222,7 +232,7 @@ export class IdpClient {
|
|
|
222
232
|
const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
|
|
223
233
|
const response = await getTransferToken.fire({
|
|
224
234
|
transferToken,
|
|
225
|
-
|
|
235
|
+
transferTarget: this.transferTarget,
|
|
226
236
|
});
|
|
227
237
|
if (response.refreshToken) {
|
|
228
238
|
await this.refreshJwt(response.refreshToken);
|
|
@@ -264,7 +274,7 @@ export class IdpClient {
|
|
|
264
274
|
this.parsedReceptionUrl.clone().set('path', '/login').toString(),
|
|
265
275
|
{
|
|
266
276
|
searchParams: {
|
|
267
|
-
|
|
277
|
+
transfertarget: plugins.smartjson.stringifyBase64(this.transferTarget),
|
|
268
278
|
},
|
|
269
279
|
},
|
|
270
280
|
);
|
|
@@ -328,10 +338,7 @@ export class IdpClient {
|
|
|
328
338
|
if (!redirect) {
|
|
329
339
|
return;
|
|
330
340
|
}
|
|
331
|
-
|
|
332
|
-
if (appData) {
|
|
333
|
-
window.location.href = appData.appUrl;
|
|
334
|
-
} else if (window.location.href.startsWith(idpLogoutUrl.origin)) {
|
|
341
|
+
if (window.location.href.startsWith(idpLogoutUrl.origin)) {
|
|
335
342
|
window.location.href = this.parsedReceptionUrl.origin;
|
|
336
343
|
}
|
|
337
344
|
}
|
|
@@ -29,7 +29,6 @@ export class IdpGlobalServerClient {
|
|
|
29
29
|
private typedrouter: any = new plugins.typedrequest.TypedRouter();
|
|
30
30
|
private typedsocket?: plugins.typedsocket.TypedSocket;
|
|
31
31
|
private typedsocketDeferred = this.createConnectionDeferred();
|
|
32
|
-
private publicKeyPushHandlers: Array<(publicKeyPemArg: string) => void | Promise<void>> = [];
|
|
33
32
|
private publicKeysPushHandlers: Array<(
|
|
34
33
|
publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]
|
|
35
34
|
) => void | Promise<void>> = [];
|
|
@@ -42,16 +41,12 @@ export class IdpGlobalServerClient {
|
|
|
42
41
|
|
|
43
42
|
constructor(private optionsArg: IIdpGlobalServerClientOptions = {}) {
|
|
44
43
|
this.typedrouter.addTypedHandler(
|
|
45
|
-
new plugins.typedrequest.TypedHandler<plugins.idpInterfaces.request.
|
|
46
|
-
'
|
|
44
|
+
new plugins.typedrequest.TypedHandler<plugins.idpInterfaces.request.IReq_PushPublicKeysForValidation>(
|
|
45
|
+
'pushPublicKeysForValidation',
|
|
47
46
|
async (requestArg) => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
...publicKeys.length
|
|
52
|
-
? this.publicKeysPushHandlers.map((handlerArg) => handlerArg(publicKeys))
|
|
53
|
-
: [],
|
|
54
|
-
]);
|
|
47
|
+
await Promise.all(
|
|
48
|
+
this.publicKeysPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeys))
|
|
49
|
+
);
|
|
55
50
|
return {};
|
|
56
51
|
}
|
|
57
52
|
)
|
|
@@ -146,13 +141,6 @@ export class IdpGlobalServerClient {
|
|
|
146
141
|
this.stopping = false;
|
|
147
142
|
}
|
|
148
143
|
|
|
149
|
-
public onPublicKeyPush(handlerArg: (publicKeyPemArg: string) => void | Promise<void>): () => void {
|
|
150
|
-
this.publicKeyPushHandlers.push(handlerArg);
|
|
151
|
-
return () => {
|
|
152
|
-
this.publicKeyPushHandlers = this.publicKeyPushHandlers.filter((handler) => handler !== handlerArg);
|
|
153
|
-
};
|
|
154
|
-
}
|
|
155
|
-
|
|
156
144
|
public onPublicKeysPush(
|
|
157
145
|
handlerArg: (
|
|
158
146
|
publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]
|
|
@@ -177,23 +165,15 @@ export class IdpGlobalServerClient {
|
|
|
177
165
|
await this.applyBackendServiceTag(socket, backendToken);
|
|
178
166
|
}
|
|
179
167
|
|
|
180
|
-
public async getPublicKeyForValidation(backendTokenArg = this.optionsArg.backendToken): Promise<string> {
|
|
181
|
-
const backendToken = this.requireBackendToken(backendTokenArg);
|
|
182
|
-
const socket = await this.connect();
|
|
183
|
-
const request = socket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetPublicKeyForValidation>('getPublicKeyForValidation');
|
|
184
|
-
const response = await this.raceWithStop(request.fire({ backendToken }));
|
|
185
|
-
return response.publicKeyPem;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
168
|
public async getPublicKeysForValidation(
|
|
189
169
|
backendTokenArg = this.optionsArg.backendToken
|
|
190
170
|
): Promise<plugins.idpInterfaces.data.IJwtVerificationKey[]> {
|
|
191
171
|
const backendToken = this.requireBackendToken(backendTokenArg);
|
|
192
172
|
const socket = await this.connect();
|
|
193
|
-
const request = socket.createTypedRequest<plugins.idpInterfaces.request.
|
|
173
|
+
const request = socket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetPublicKeysForValidation>('getPublicKeysForValidation');
|
|
194
174
|
const response = await this.raceWithStop(request.fire({ backendToken }));
|
|
195
175
|
if (!Array.isArray(response.publicKeys) || response.publicKeys.length === 0) {
|
|
196
|
-
throw new Error('IdP
|
|
176
|
+
throw new Error('IdP returned an invalid JWT verification key set.');
|
|
197
177
|
}
|
|
198
178
|
return response.publicKeys;
|
|
199
179
|
}
|