@idp.global/sdk 10.0.0 → 12.0.0

package/changelog.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 2026-07-18 - 12.0.0
+
+### Breaking Changes
+
+- adopt interfaces v20 current-user DTO for password auth results (server-client)
+  - Upgrade @idp.global/interfaces to ^20.0.1.
+  - Change IIdpPasswordAuthResult.user from IUser to ICurrentUserDto to match the privacy-safe whoIs response.
+
+## 2026-07-18 - next
+
+### Breaking Changes
+
+- adopt `@idp.global/interfaces` 20 and type password-login identity data as the
+  privacy-safe `ICurrentUserDto` actually returned by `whoIs`, rather than the
+  persisted `IUser` shape that includes server-only credential fields
+
+## 2026-07-16 - 11.0.0
+
+### Breaking Changes
+
+- adopt `@idp.global/interfaces` 13 so SDK activity request responses expose only structured, finite, privacy-safe event classifications
+- remove the singular JWT verification-key fetch and push APIs; backend integrations now use only `getPublicKeysForValidation`, `pushPublicKeysForValidation`, and complete keysets
+- replace browser app metadata in transfer flows with the minimal `transferTarget: { appUrl }` contract, including the `transfertarget` login query parameter
+- 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
+
+### Maintenance
+
+- update typed request/socket, smartdata, smartrx, webstore, smartdb, and Node.js type dependencies before release
+
 ## 2026-07-11 - 10.0.0
 
 ### Breaking Changes

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@idp.global/sdk',
-    version: '10.0.0',
+    version: '12.0.0',
     description: 'Reusable browser and server SDK for idp.global authentication.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxpQkFBaUI7SUFDdkIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdFQUFnRTtDQUM5RSxDQUFBIn0=

package/dist_ts_browser/classes.idpclient.d.ts

@@ -1,15 +1,16 @@
 import { IdpRequests } from './classes.idprequests.js';
 import * as plugins from './plugins.js';
 export declare class IdpClient {
+    #private;
     private helpers;
-    appData: plugins.idpInterfaces.data.IAppLegacy;
     rolesReplaySubject: plugins.smartrx.rxjs.ReplaySubject<unknown>;
     organizationsReplaySubject: plugins.smartrx.rxjs.ReplaySubject<unknown>;
     parsedReceptionUrl: plugins.smarturl.Smarturl;
-    constructor(receptionBaseUrlArg: string, appDataArg?: plugins.idpInterfaces.data.IAppLegacy);
+    constructor(receptionBaseUrlArg: string, transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget);
+    get transferTarget(): Readonly<plugins.idpInterfaces.data.ITransferTarget>;
     requests: IdpRequests;
     checkWetherOnReceptionDomain(): boolean;
-    getAppDataOnSsoDomain(): Promise<any>;
+    private normalizeTransferTargetAppUrl;
     setJwt(jwtStringArg: string): Promise<void>;
     setRefreshToken(refreshTokenArg: string): Promise<void>;
     typedsocket: plugins.typedsocket.TypedSocket;
@@ -28,8 +29,9 @@ export declare class IdpClient {
     refreshJwt(refreshTokenArg?: string): Promise<string | null>;
     private isAuthInvalidResponse;
     private validateJwtWithServer;
-    getTransferToken(appDataArg?: plugins.idpInterfaces.data.IAppLegacy): Promise<string | null>;
-    getTransferTokenAndSwitchToLocation(newLocationArg: string): Promise<void>;
+    getTransferToken(): Promise<string | null>;
+    private getTransferTokenForTarget;
+    getTransferTokenAndSwitchToLocation(): Promise<void>;
     private scrubTransferTokenFromCurrentUrl;
     processTransferToken(): Promise<boolean>;
     checkJwtPresent(): Promise<boolean>;

package/dist_ts_browser/classes.idpclient.js

@@ -6,11 +6,11 @@ export class IdpClient {
             return plugins.webjwt.getDataFromJwtString(jwtString);
         },
     };
-    appData;
+    #transferTargetAppUrl;
     rolesReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
     organizationsReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
     parsedReceptionUrl;
-    constructor(receptionBaseUrlArg, appDataArg) {
+    constructor(receptionBaseUrlArg, transferTargetArg) {
         if (receptionBaseUrlArg.endsWith('/')) {
             receptionBaseUrlArg = receptionBaseUrlArg.slice(0, -1);
         }
@@ -18,34 +18,30 @@ export class IdpClient {
             receptionBaseUrlArg = `${receptionBaseUrlArg}/typedrequest`;
         }
         this.parsedReceptionUrl = plugins.smarturl.Smarturl.createFromUrl(receptionBaseUrlArg);
-        if (!appDataArg) {
-            appDataArg = {
-                id: '',
-                appUrl: typeof window !== 'undefined' ? `https://${window.location.host}/` : '',
-                description: '',
-                logoUrl: '',
-                name: '',
-            };
-        }
-        this.appData = appDataArg;
+        this.#transferTargetAppUrl = this.normalizeTransferTargetAppUrl(transferTargetArg || {
+            appUrl: typeof window !== 'undefined' ? window.location.origin : '',
+        });
+    }
+    get transferTarget() {
+        return Object.freeze({ appUrl: this.#transferTargetAppUrl });
     }
     requests = new IdpRequests(this);
     checkWetherOnReceptionDomain() {
         return plugins.smarturl.Smarturl.createFromUrl(window.location.href).hostname ===
             this.parsedReceptionUrl.hostname;
     }
-    async getAppDataOnSsoDomain() {
-        if (!window.location.href.startsWith('https://sso.workspace.global/')) {
-            console.error('You are trying to access SSO appData on a non sso domain.');
-            return null;
+    normalizeTransferTargetAppUrl(transferTargetArg) {
+        let appUrl;
+        try {
+            appUrl = new URL(transferTargetArg.appUrl);
         }
-        const appDataString = plugins.smarturl.Smarturl.createFromUrl(window.location.href).searchParams
-            .appdata;
-        if (!appDataString) {
-            console.error('no appdata query arg detected');
-            return null;
+        catch {
+            throw new Error('transferTarget.appUrl must be an absolute HTTPS URL');
+        }
+        if (appUrl.protocol !== 'https:' || appUrl.username || appUrl.password) {
+            throw new Error('transferTarget.appUrl must be a credential-free HTTPS URL');
         }
-        return plugins.smartjson.parseBase64(appDataString);
+        return appUrl.toString();
     }
     async setJwt(jwtStringArg) {
         await this.storeJwt(jwtStringArg);
@@ -148,7 +144,10 @@ export class IdpClient {
             throw error;
         }
     }
-    async getTransferToken(appDataArg) {
+    async getTransferToken() {
+        return this.getTransferTokenForTarget(this.transferTarget);
+    }
+    async getTransferTokenForTarget(transferTargetArg) {
         await this.performJwtHousekeeping();
         const refreshToken = await this.getRefreshToken();
         if (!refreshToken) {
@@ -158,16 +157,17 @@ export class IdpClient {
         const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
         const response = await getTransferToken.fire({
             refreshToken,
-            appData: appDataArg || this.appData,
+            transferTarget: transferTargetArg,
         });
         return response.transferToken;
     }
-    async getTransferTokenAndSwitchToLocation(newLocationArg) {
-        const transferToken = await this.getTransferToken();
+    async getTransferTokenAndSwitchToLocation() {
+        const transferTarget = this.transferTarget;
+        const transferToken = await this.getTransferTokenForTarget(transferTarget);
         if (!transferToken) {
-            alert('failed to get transfer token!');
+            throw new Error('IdP did not return a transfer token');
         }
-        const urlInstance = plugins.smarturl.Smarturl.createFromUrl(newLocationArg, {
+        const urlInstance = plugins.smarturl.Smarturl.createFromUrl(transferTarget.appUrl, {
             searchParams: { transfertoken: transferToken },
         });
         window.location.href = urlInstance.toString();
@@ -193,7 +193,7 @@ export class IdpClient {
             const getTransferToken = this.typedsocket.createTypedRequest('exchangeRefreshTokenAndTransferToken');
             const response = await getTransferToken.fire({
                 transferToken,
-                appData: this.appData,
+                transferTarget: this.transferTarget,
             });
             if (response.refreshToken) {
                 await this.refreshJwt(response.refreshToken);
@@ -232,7 +232,7 @@ export class IdpClient {
         if (requireLoginArg) {
             const urlInstance = plugins.smarturl.Smarturl.createFromUrl(this.parsedReceptionUrl.clone().set('path', '/login').toString(), {
                 searchParams: {
-                    appdata: plugins.smartjson.stringifyBase64(this.appData),
+                    transfertarget: plugins.smartjson.stringifyBase64(this.transferTarget),
                 },
             });
             if (!globalThis.location.href.startsWith(this.parsedReceptionUrl.toString())) {
@@ -292,11 +292,7 @@ export class IdpClient {
         if (!redirect) {
             return;
         }
-        const appData = await this.getAppDataOnSsoDomain();
-        if (appData) {
-            window.location.href = appData.appUrl;
-        }
-        else if (window.location.href.startsWith(idpLogoutUrl.origin)) {
+        if (window.location.href.startsWith(idpLogoutUrl.origin)) {
             window.location.href = this.parsedReceptionUrl.origin;
         }
     }
@@ -373,4 +369,4 @@ export class IdpClient {
         return whoIs.fire({ jwt: await this.getJwt() });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.idpclient.js","sourceRoot":"","sources":["../ts_browser/classes.idpclient.ts"],"names":[],"mappings":"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"}

package/dist_ts_server/classes.idp-global-server-client.d.ts

@@ -5,7 +5,7 @@ export interface IIdpGlobalServerClientOptions {
 }
 export declare const defaultIdpGlobalBaseUrl = "https://idp.global";
 export interface IIdpPasswordAuthResult {
-    user: plugins.idpInterfaces.data.IUser;
+    user: plugins.idpInterfaces.dto.ICurrentUserDto;
     jwt: string;
     refreshToken: string;
 }
@@ -22,7 +22,6 @@ export declare class IdpGlobalServerClient {
     private typedrouter;
     private typedsocket?;
     private typedsocketDeferred;
-    private publicKeyPushHandlers;
     private publicKeysPushHandlers;
     private blocklistPushHandlers;
     private connectionGeneration;
@@ -33,11 +32,9 @@ export declare class IdpGlobalServerClient {
     constructor(optionsArg?: IIdpGlobalServerClientOptions);
     connect(): Promise<plugins.typedsocket.TypedSocket>;
     stop(): Promise<void>;
-    onPublicKeyPush(handlerArg: (publicKeyPemArg: string) => void | Promise<void>): () => void;
     onPublicKeysPush(handlerArg: (publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]) => void | Promise<void>): () => void;
     onBlocklistPush(handlerArg: (blockedJwtIdsArg: string[]) => void | Promise<void>): () => void;
     registerBackendService(backendTokenArg?: string): Promise<void>;
-    getPublicKeyForValidation(backendTokenArg?: string): Promise<string>;
     getPublicKeysForValidation(backendTokenArg?: string): Promise<plugins.idpInterfaces.data.IJwtVerificationKey[]>;
     getJwtIdBlocklist(backendTokenArg?: string): Promise<string[]>;
     loginWithEmailAndPassword(optionsArg: {

package/dist_ts_server/classes.idp-global-server-client.js

@@ -15,7 +15,6 @@ export class IdpGlobalServerClient {
     typedrouter = new plugins.typedrequest.TypedRouter();
     typedsocket;
     typedsocketDeferred = this.createConnectionDeferred();
-    publicKeyPushHandlers = [];
     publicKeysPushHandlers = [];
     blocklistPushHandlers = [];
     connectionGeneration = 0;
@@ -25,14 +24,8 @@ export class IdpGlobalServerClient {
     stopping = false;
     constructor(optionsArg = {}) {
         this.optionsArg = optionsArg;
-        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('pushPublicKeyForValidation', async (requestArg) => {
-            const publicKeys = Array.isArray(requestArg.publicKeys) ? requestArg.publicKeys : [];
-            await Promise.all([
-                ...this.publicKeyPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeyPem)),
-                ...publicKeys.length
-                    ? this.publicKeysPushHandlers.map((handlerArg) => handlerArg(publicKeys))
-                    : [],
-            ]);
+        this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('pushPublicKeysForValidation', async (requestArg) => {
+            await Promise.all(this.publicKeysPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeys)));
             return {};
         }));
         this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('pushOrGetJwtIdBlocklist', async (requestArg) => {
@@ -115,12 +108,6 @@ export class IdpGlobalServerClient {
         this.pendingSocketPromise = undefined;
         this.stopping = false;
     }
-    onPublicKeyPush(handlerArg) {
-        this.publicKeyPushHandlers.push(handlerArg);
-        return () => {
-            this.publicKeyPushHandlers = this.publicKeyPushHandlers.filter((handler) => handler !== handlerArg);
-        };
-    }
     onPublicKeysPush(handlerArg) {
         this.publicKeysPushHandlers.push(handlerArg);
         return () => {
@@ -138,20 +125,13 @@ export class IdpGlobalServerClient {
         const socket = await this.connect();
         await this.applyBackendServiceTag(socket, backendToken);
     }
-    async getPublicKeyForValidation(backendTokenArg = this.optionsArg.backendToken) {
-        const backendToken = this.requireBackendToken(backendTokenArg);
-        const socket = await this.connect();
-        const request = socket.createTypedRequest('getPublicKeyForValidation');
-        const response = await this.raceWithStop(request.fire({ backendToken }));
-        return response.publicKeyPem;
-    }
     async getPublicKeysForValidation(backendTokenArg = this.optionsArg.backendToken) {
         const backendToken = this.requireBackendToken(backendTokenArg);
         const socket = await this.connect();
-        const request = socket.createTypedRequest('getPublicKeyForValidation');
+        const request = socket.createTypedRequest('getPublicKeysForValidation');
         const response = await this.raceWithStop(request.fire({ backendToken }));
         if (!Array.isArray(response.publicKeys) || response.publicKeys.length === 0) {
-            throw new Error('IdP did not return a JWT verification key set; upgrade the IdP before enabling key rollover.');
+            throw new Error('IdP returned an invalid JWT verification key set.');
         }
         return response.publicKeys;
     }
@@ -237,4 +217,4 @@ export class IdpGlobalServerClient {
         this.stopWaiters.clear();
     }
 }
-//# 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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"}
+//# 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

@@ -1,6 +1,6 @@
 {
   "name": "@idp.global/sdk",
-  "version": "10.0.0",
+  "version": "12.0.0",
   "private": false,
   "description": "Reusable browser and server SDK for idp.global authentication.",
   "type": "module",
@@ -14,25 +14,25 @@
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "dependencies": {
-    "@api.global/typedrequest": "^3.3.0",
-    "@api.global/typedsocket": "^4.2.3",
-    "@idp.global/interfaces": "^11.0.0",
-    "@push.rocks/smartdata": "^7.1.7",
+    "@api.global/typedrequest": "^3.3.2",
+    "@api.global/typedsocket": "^4.2.5",
+    "@idp.global/interfaces": "^20.0.1",
+    "@push.rocks/smartdata": "^7.2.1",
     "@push.rocks/smartjson": "^6.0.1",
     "@push.rocks/smartpromise": "^4.2.4",
-    "@push.rocks/smartrx": "^3.0.10",
+    "@push.rocks/smartrx": "^3.0.12",
     "@push.rocks/smarttime": "^4.2.3",
     "@push.rocks/smarturl": "^3.1.0",
     "@push.rocks/webjwt": "^1.0.10",
-    "@push.rocks/webstore": "^2.0.22"
+    "@push.rocks/webstore": "^2.0.23"
   },
   "devDependencies": {
     "@git.zone/tsbuild": "^4.4.2",
     "@git.zone/tsdoc": "^2.1.1",
     "@git.zone/tsrun": "^2.0.5",
     "@git.zone/tstest": "^3.6.6",
-    "@push.rocks/smartdb": "^2.10.0",
-    "@types/node": "^26.1.0"
+    "@push.rocks/smartdb": "^2.12.2",
+    "@types/node": "^26.1.1"
   },
   "files": [
     "ts/**/*",

package/readme.md

@@ -34,11 +34,7 @@ import { IdpClient } from '@idp.global/sdk/browser';
 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.
 
 ```ts
-const idp = new IdpClient('https://sso.workspace.global', {
-  id: 'my-app',
-  name: 'My App',
-  description: 'The app your users actually want to open.',
-  logoUrl: 'https://app.example.com/logo.svg',
+const idp = new IdpClient('https://idp.global', {
   appUrl: 'https://app.example.com/',
 });
 
@@ -51,7 +47,7 @@ if (loggedIn) {
 }
 ```
 
-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 your app metadata encoded as `appdata`.
+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`.
 
 ### Token Handling
 
@@ -94,29 +90,30 @@ if (loginResponse.refreshToken) {
 Transfer tokens are the handoff mechanism for moving a logged-in user between apps without exposing refresh tokens to URLs.
 
 ```ts
-const transferToken = await idp.getTransferToken();
-if (transferToken) {
-  const target = new URL('https://another-app.example.com/');
-  target.searchParams.set('transfertoken', transferToken);
-  window.location.href = target.toString();
-}
+await idp.getTransferTokenAndSwitchToLocation();
 ```
 
 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.
 
+The SDK accepts only absolute, credential-free HTTPS transfer targets and uses
+the same configured target for token exchange and navigation. The
+`transfertarget` query value is a request, not proof of authorization: the IdP
+must match it against an exact registered redirect target and bind it to the
+single-use transfer token before issuing that token.
+
 ### Logout
 
 ```ts
 await idp.logout();
 ```
 
-`logout()` clears local auth state and, when a refresh token is available on the SSO origin, asks idp.global to revoke the session before returning the user to the original app URL when app metadata is present.
+`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.
 
 ### Browser API Surface
 
 | API | Description |
 | --- | --- |
-| `new IdpClient(receptionBaseUrl, appData?)` | Configure an idp.global browser client. |
+| `new IdpClient(receptionBaseUrl, transferTarget?)` | Configure an idp.global browser client with a minimal `{ appUrl }` return target. |
 | `enableTypedSocket()` / `stop()` | Start or stop the typed-socket connection. |
 | `determineLoginStatus(requireLogin?)` | Resolve login state from JWT, refresh token, transfer token, or optional redirect. |
 | `statusObservable` | RxJS subject that emits idp.global login status changes during refresh flows. |
@@ -124,8 +121,8 @@ await idp.logout();
 | `getRolesAndOrganizations()` | Fetch roles and organizations for the current user. |
 | `createOrganization(name, slug, mode)` | Check organization slug availability or manifest an organization. |
 | `updatePaddleCheckoutId(orgId, checkoutId)` | Send a Paddle checkout ID as the org payment method update. |
-| `getTransferToken(appData?)` | Exchange the current refresh token for a transfer token. |
-| `getTransferTokenAndSwitchToLocation(url)` | Create a transfer token and redirect with `transfertoken` attached. |
+| `getTransferToken()` | Request a transfer token for the configured transfer target. |
+| `getTransferTokenAndSwitchToLocation()` | Request a transfer token and navigate to the same configured target with `transfertoken` attached. |
 | `processTransferToken()` | Consume a `transfertoken` from the current URL and refresh local auth state. |
 | `logout()` | Revoke and clear the current login flow. |
 
@@ -133,11 +130,18 @@ await idp.logout();
 
 `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.
 
-SDK 10 adopts interfaces v11. OIDC app creation requires explicit client
+SDK 11 adopts interfaces v13. JWT verification-key distribution is keyset-only
+and uses the plural `getPublicKeysForValidation` and
+`pushPublicKeysForValidation` contracts. Transfer-token exchange accepts only
+the minimal `transferTarget: { appUrl }` destination. OIDC app creation requires explicit client
 type, grant types, callback and post-logout URIs, and token lifetime settings.
 Public clients do not receive a client secret; confidential client secrets are
 returned only once when created or rotated. The unsupported
-`client_credentials` grant and legacy API-token login are not exposed.
+`client_credentials` grant and API-token login are not exposed.
+`getUserActivity` and `exportUserActivity` return structured activity events
+with finite action, outcome, target-type, reason-code, and allowlisted-fact
+fields; persistence IDs, free text, network data, integrity material, and sink
+delivery state are not part of the SDK contract.
 
 | Area | Request getters |
 | --- | --- |
@@ -260,9 +264,8 @@ const publicKeys = await idpClient.getPublicKeysForValidation();
 const blockedJwtIds = await idpClient.getJwtIdBlocklist();
 ```
 
-`getPublicKeyForValidation()` and `onPublicKeyPush()` remain available for
-single-key consumers. Rollover-capable verifiers should use the key-set APIs,
-select by the JWT header `kid`, and reject unknown key IDs.
+Verification is keyset-only. Replace the cached snapshot on every push, select
+the verification key by the JWT header `kid`, and reject unknown key IDs.
 
 ### Server API Surface
 
@@ -291,7 +294,7 @@ The server export includes these TypeScript types:
 | `IAuthenticateAccountOptions` | Input for `AccountAuthService.authenticate()`. |
 | `IAuthenticatedAccountResult` | Successful auth result with account, auth source, and optional idp.global tokens. |
 | `IIdpGlobalServerClientOptions` | Server client configuration with optional `baseUrl` and `backendToken`; defaults to `https://idp.global`. |
-| `IIdpPasswordAuthResult` | idp.global user, JWT, and refresh-token result. |
+| `IIdpPasswordAuthResult` | Privacy-safe current-user DTO, JWT, and refresh-token result. |
 
 ## Runtime Notes
 
@@ -310,7 +313,7 @@ The SDK uses typed sockets and typed requests from `@api.global/*`, shared idp.g
 pnpm test
 ```
 
-The test suite covers the server account store and auth service, browser transfer-token handling, typed administrative request names, and backend JWT key-set and blocklist push behavior, including staged compatibility with a legacy single-key IdP.
+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.
 
 ## License and Legal Information
 

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@idp.global/sdk',
-  version: '10.0.0',
+  version: '12.0.0',
   description: 'Reusable browser and server SDK for idp.global authentication.'
 }

package/ts_browser/classes.idpclient.ts

@@ -8,13 +8,16 @@ export class IdpClient {
     },
   };
 
-  public appData: plugins.idpInterfaces.data.IAppLegacy;
+  readonly #transferTargetAppUrl: string;
   public rolesReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
   public organizationsReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(1);
 
   public parsedReceptionUrl: plugins.smarturl.Smarturl;
 
-  constructor(receptionBaseUrlArg: string, appDataArg?: plugins.idpInterfaces.data.IAppLegacy) {
+  constructor(
+    receptionBaseUrlArg: string,
+    transferTargetArg?: plugins.idpInterfaces.data.ITransferTarget
+  ) {
     if (receptionBaseUrlArg.endsWith('/')) {
       receptionBaseUrlArg = receptionBaseUrlArg.slice(0, -1);
     }
@@ -22,16 +25,15 @@ export class IdpClient {
       receptionBaseUrlArg = `${receptionBaseUrlArg}/typedrequest`;
     }
     this.parsedReceptionUrl = plugins.smarturl.Smarturl.createFromUrl(receptionBaseUrlArg);
-    if (!appDataArg) {
-      appDataArg = {
-        id: '',
-        appUrl: typeof window !== 'undefined' ? `https://${window.location.host}/` : '',
-        description: '',
-        logoUrl: '',
-        name: '',
-      };
-    }
-    this.appData = appDataArg;
+    this.#transferTargetAppUrl = this.normalizeTransferTargetAppUrl(
+      transferTargetArg || {
+        appUrl: typeof window !== 'undefined' ? window.location.origin : '',
+      }
+    );
+  }
+
+  public get transferTarget(): Readonly<plugins.idpInterfaces.data.ITransferTarget> {
+    return Object.freeze({ appUrl: this.#transferTargetAppUrl });
   }
 
   public requests = new IdpRequests(this);
@@ -41,18 +43,19 @@ export class IdpClient {
       this.parsedReceptionUrl.hostname;
   }
 
-  public async getAppDataOnSsoDomain() {
-    if (!window.location.href.startsWith('https://sso.workspace.global/')) {
-      console.error('You are trying to access SSO appData on a non sso domain.');
-      return null;
+  private normalizeTransferTargetAppUrl(
+    transferTargetArg: plugins.idpInterfaces.data.ITransferTarget
+  ): string {
+    let appUrl: URL;
+    try {
+      appUrl = new URL(transferTargetArg.appUrl);
+    } catch {
+      throw new Error('transferTarget.appUrl must be an absolute HTTPS URL');
     }
-    const appDataString = plugins.smarturl.Smarturl.createFromUrl(window.location.href).searchParams
-      .appdata;
-    if (!appDataString) {
-      console.error('no appdata query arg detected');
-      return null;
+    if (appUrl.protocol !== 'https:' || appUrl.username || appUrl.password) {
+      throw new Error('transferTarget.appUrl must be a credential-free HTTPS URL');
     }
-    return plugins.smartjson.parseBase64(appDataString);
+    return appUrl.toString();
   }
 
   public async setJwt(jwtStringArg: string) {
@@ -174,7 +177,13 @@ export class IdpClient {
     }
   }
 
-  public async getTransferToken(appDataArg?: plugins.idpInterfaces.data.IAppLegacy): Promise<string | null> {
+  public async getTransferToken(): Promise<string | null> {
+    return this.getTransferTokenForTarget(this.transferTarget);
+  }
+
+  private async getTransferTokenForTarget(
+    transferTargetArg: Readonly<plugins.idpInterfaces.data.ITransferTarget>
+  ): Promise<string | null> {
     await this.performJwtHousekeeping();
     const refreshToken = await this.getRefreshToken();
     if (!refreshToken) {
@@ -184,17 +193,18 @@ export class IdpClient {
     const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
     const response = await getTransferToken.fire({
       refreshToken,
-      appData: appDataArg || this.appData,
+      transferTarget: transferTargetArg,
     });
     return response.transferToken;
   }
 
-  public async getTransferTokenAndSwitchToLocation(newLocationArg: string): Promise<void> {
-    const transferToken = await this.getTransferToken();
+  public async getTransferTokenAndSwitchToLocation(): Promise<void> {
+    const transferTarget = this.transferTarget;
+    const transferToken = await this.getTransferTokenForTarget(transferTarget);
     if (!transferToken) {
-      alert('failed to get transfer token!');
+      throw new Error('IdP did not return a transfer token');
     }
-    const urlInstance = plugins.smarturl.Smarturl.createFromUrl(newLocationArg, {
+    const urlInstance = plugins.smarturl.Smarturl.createFromUrl(transferTarget.appUrl, {
       searchParams: { transfertoken: transferToken },
     });
     window.location.href = urlInstance.toString();
@@ -222,7 +232,7 @@ export class IdpClient {
       const getTransferToken = this.typedsocket.createTypedRequest<plugins.idpInterfaces.request.IReq_ExchangeRefreshTokenAndTransferToken>('exchangeRefreshTokenAndTransferToken');
       const response = await getTransferToken.fire({
         transferToken,
-        appData: this.appData,
+        transferTarget: this.transferTarget,
       });
       if (response.refreshToken) {
         await this.refreshJwt(response.refreshToken);
@@ -264,7 +274,7 @@ export class IdpClient {
         this.parsedReceptionUrl.clone().set('path', '/login').toString(),
         {
           searchParams: {
-            appdata: plugins.smartjson.stringifyBase64(this.appData),
+            transfertarget: plugins.smartjson.stringifyBase64(this.transferTarget),
           },
         },
       );
@@ -328,10 +338,7 @@ export class IdpClient {
     if (!redirect) {
       return;
     }
-    const appData = await this.getAppDataOnSsoDomain();
-    if (appData) {
-      window.location.href = appData.appUrl;
-    } else if (window.location.href.startsWith(idpLogoutUrl.origin)) {
+    if (window.location.href.startsWith(idpLogoutUrl.origin)) {
       window.location.href = this.parsedReceptionUrl.origin;
     }
   }

package/ts_server/classes.idp-global-server-client.ts

@@ -8,7 +8,7 @@ export interface IIdpGlobalServerClientOptions {
 export const defaultIdpGlobalBaseUrl = 'https://idp.global';
 
 export interface IIdpPasswordAuthResult {
-  user: plugins.idpInterfaces.data.IUser;
+  user: plugins.idpInterfaces.dto.ICurrentUserDto;
   jwt: string;
   refreshToken: string;
 }
@@ -29,7 +29,6 @@ export class IdpGlobalServerClient {
   private typedrouter: any = new plugins.typedrequest.TypedRouter();
   private typedsocket?: plugins.typedsocket.TypedSocket;
   private typedsocketDeferred = this.createConnectionDeferred();
-  private publicKeyPushHandlers: Array<(publicKeyPemArg: string) => void | Promise<void>> = [];
   private publicKeysPushHandlers: Array<(
     publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]
   ) => void | Promise<void>> = [];
@@ -42,16 +41,12 @@ export class IdpGlobalServerClient {
 
   constructor(private optionsArg: IIdpGlobalServerClientOptions = {}) {
     this.typedrouter.addTypedHandler(
-      new plugins.typedrequest.TypedHandler<plugins.idpInterfaces.request.IReq_PushPublicKeyForValidation>(
-        'pushPublicKeyForValidation',
+      new plugins.typedrequest.TypedHandler<plugins.idpInterfaces.request.IReq_PushPublicKeysForValidation>(
+        'pushPublicKeysForValidation',
         async (requestArg) => {
-          const publicKeys = Array.isArray(requestArg.publicKeys) ? requestArg.publicKeys : [];
-          await Promise.all([
-            ...this.publicKeyPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeyPem)),
-            ...publicKeys.length
-              ? this.publicKeysPushHandlers.map((handlerArg) => handlerArg(publicKeys))
-              : [],
-          ]);
+          await Promise.all(
+            this.publicKeysPushHandlers.map((handlerArg) => handlerArg(requestArg.publicKeys))
+          );
           return {};
         }
       )
@@ -146,13 +141,6 @@ export class IdpGlobalServerClient {
     this.stopping = false;
   }
 
-  public onPublicKeyPush(handlerArg: (publicKeyPemArg: string) => void | Promise<void>): () => void {
-    this.publicKeyPushHandlers.push(handlerArg);
-    return () => {
-      this.publicKeyPushHandlers = this.publicKeyPushHandlers.filter((handler) => handler !== handlerArg);
-    };
-  }
-
   public onPublicKeysPush(
     handlerArg: (
       publicKeysArg: plugins.idpInterfaces.data.IJwtVerificationKey[]
@@ -177,23 +165,15 @@ export class IdpGlobalServerClient {
     await this.applyBackendServiceTag(socket, backendToken);
   }
 
-  public async getPublicKeyForValidation(backendTokenArg = this.optionsArg.backendToken): Promise<string> {
-    const backendToken = this.requireBackendToken(backendTokenArg);
-    const socket = await this.connect();
-    const request = socket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetPublicKeyForValidation>('getPublicKeyForValidation');
-    const response = await this.raceWithStop(request.fire({ backendToken }));
-    return response.publicKeyPem;
-  }
-
   public async getPublicKeysForValidation(
     backendTokenArg = this.optionsArg.backendToken
   ): Promise<plugins.idpInterfaces.data.IJwtVerificationKey[]> {
     const backendToken = this.requireBackendToken(backendTokenArg);
     const socket = await this.connect();
-    const request = socket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetPublicKeyForValidation>('getPublicKeyForValidation');
+    const request = socket.createTypedRequest<plugins.idpInterfaces.request.IReq_GetPublicKeysForValidation>('getPublicKeysForValidation');
     const response = await this.raceWithStop(request.fire({ backendToken }));
     if (!Array.isArray(response.publicKeys) || response.publicKeys.length === 0) {
-      throw new Error('IdP did not return a JWT verification key set; upgrade the IdP before enabling key rollover.');
+      throw new Error('IdP returned an invalid JWT verification key set.');
     }
     return response.publicKeys;
   }