@zskj-idaas/sdk 1.0.1 → 1.0.3

package/dist/index.d.mts

@@ -18,6 +18,11 @@ interface TokenSet {
     refresh_token?: string;
     scope: string;
 }
+interface ServiceTokenState {
+    accessToken: string;
+    expiresAt: number;
+    scope: string;
+}
 interface UserInfo {
     sub: string;
     preferred_username?: string;
@@ -35,6 +40,10 @@ interface AuthState {
     idToken: string | null;
     expiresAt: number | null;
 }
+interface SessionLogoutOptions {
+    /** Redirect after the server-side session and local tokens are cleared. */
+    redirectTo?: string;
+}
 interface PKCEPair {
     codeVerifier: string;
     codeChallenge: string;
@@ -45,6 +54,7 @@ declare class IdaasClient {
     private endpoints;
     private storage;
     private userInfo;
+    private serviceTokens;
     constructor(config: IdaasConfig);
     init(): Promise<AuthState>;
     private discover;
@@ -53,13 +63,16 @@ declare class IdaasClient {
     refreshToken(): Promise<TokenSet | null>;
     getUserInfo(forceRefresh?: boolean): Promise<UserInfo | null>;
     getAccessToken(): Promise<string | null>;
+    getServiceToken(serviceKey: string): Promise<string | null>;
     getIdToken(): string | null;
     getAuthState(): AuthState;
     isAuthenticated(): boolean;
     logout(): Promise<void>;
+    logoutSession(options?: SessionLogoutOptions): Promise<void>;
     revokeToken(): Promise<void>;
     /** Create an authenticated fetch wrapper */
     fetch(url: string, init?: RequestInit): Promise<Response>;
+    fetchService(serviceKey: string, url: string, init?: RequestInit): Promise<Response>;
 }
 
 declare function createPKCE(): Promise<PKCEPair>;
@@ -86,4 +99,4 @@ declare class TokenStorage {
     clearAuthState(): void;
 }
 
-export { type AuthState, IdaasClient, type IdaasConfig, type TokenSet, TokenStorage, type UserInfo, createPKCE, generateNonce, generateState };
+export { type AuthState, IdaasClient, type IdaasConfig, type ServiceTokenState, type SessionLogoutOptions, type TokenSet, TokenStorage, type UserInfo, createPKCE, generateNonce, generateState };

package/dist/index.d.ts

@@ -18,6 +18,11 @@ interface TokenSet {
     refresh_token?: string;
     scope: string;
 }
+interface ServiceTokenState {
+    accessToken: string;
+    expiresAt: number;
+    scope: string;
+}
 interface UserInfo {
     sub: string;
     preferred_username?: string;
@@ -35,6 +40,10 @@ interface AuthState {
     idToken: string | null;
     expiresAt: number | null;
 }
+interface SessionLogoutOptions {
+    /** Redirect after the server-side session and local tokens are cleared. */
+    redirectTo?: string;
+}
 interface PKCEPair {
     codeVerifier: string;
     codeChallenge: string;
@@ -45,6 +54,7 @@ declare class IdaasClient {
     private endpoints;
     private storage;
     private userInfo;
+    private serviceTokens;
     constructor(config: IdaasConfig);
     init(): Promise<AuthState>;
     private discover;
@@ -53,13 +63,16 @@ declare class IdaasClient {
     refreshToken(): Promise<TokenSet | null>;
     getUserInfo(forceRefresh?: boolean): Promise<UserInfo | null>;
     getAccessToken(): Promise<string | null>;
+    getServiceToken(serviceKey: string): Promise<string | null>;
     getIdToken(): string | null;
     getAuthState(): AuthState;
     isAuthenticated(): boolean;
     logout(): Promise<void>;
+    logoutSession(options?: SessionLogoutOptions): Promise<void>;
     revokeToken(): Promise<void>;
     /** Create an authenticated fetch wrapper */
     fetch(url: string, init?: RequestInit): Promise<Response>;
+    fetchService(serviceKey: string, url: string, init?: RequestInit): Promise<Response>;
 }
 
 declare function createPKCE(): Promise<PKCEPair>;
@@ -86,4 +99,4 @@ declare class TokenStorage {
     clearAuthState(): void;
 }
 
-export { type AuthState, IdaasClient, type IdaasConfig, type TokenSet, TokenStorage, type UserInfo, createPKCE, generateNonce, generateState };
+export { type AuthState, IdaasClient, type IdaasConfig, type ServiceTokenState, type SessionLogoutOptions, type TokenSet, TokenStorage, type UserInfo, createPKCE, generateNonce, generateState };

package/dist/index.js

@@ -254,6 +254,7 @@ var IdaasClient = class {
   constructor(config) {
     this.endpoints = null;
     this.userInfo = null;
+    this.serviceTokens = /* @__PURE__ */ new Map();
     this.config = {
       scope: "openid profile email",
       autoDiscovery: true,
@@ -276,6 +277,7 @@ var IdaasClient = class {
         introspection_endpoint: `${this.config.issuer}/oauth2/introspect`
       };
     }
+    await this.getAccessToken();
     return this.getAuthState();
   }
   async discover() {
@@ -392,14 +394,40 @@ var IdaasClient = class {
     return this.userInfo;
   }
   async getAccessToken() {
-    let token = this.storage.getAccessToken();
-    if (token) return token;
-    if (this.storage.isTokenExpired()) {
-      const tokens = await this.refreshToken();
-      if (tokens) return tokens.access_token;
-    }
+    const token = this.storage.getAccessToken();
+    if (token && !this.storage.isTokenExpired()) return token;
+    const tokens = await this.refreshToken();
+    if (tokens) return tokens.access_token;
     return null;
   }
+  async getServiceToken(serviceKey) {
+    if (!this.endpoints) await this.init();
+    const cached = this.serviceTokens.get(serviceKey);
+    if (cached && Date.now() < cached.expiresAt - 6e4) {
+      return cached.accessToken;
+    }
+    const baseToken = await this.getAccessToken();
+    if (!baseToken) return null;
+    const res = await fetch(`${this.config.issuer}/oauth2/business-token`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${baseToken}`
+      },
+      body: JSON.stringify({ service_key: serviceKey })
+    });
+    if (!res.ok) {
+      this.serviceTokens.delete(serviceKey);
+      return null;
+    }
+    const tokenSet = await res.json();
+    this.serviceTokens.set(serviceKey, {
+      accessToken: tokenSet.access_token,
+      expiresAt: Date.now() + tokenSet.expires_in * 1e3,
+      scope: tokenSet.scope
+    });
+    return tokenSet.access_token;
+  }
   getIdToken() {
     return this.storage.getIdToken();
   }
@@ -428,6 +456,17 @@ var IdaasClient = class {
     }
     window.location.href = `${this.endpoints.end_session_endpoint}?${params.toString()}`;
   }
+  async logoutSession(options = {}) {
+    this.storage.clear();
+    this.userInfo = null;
+    await fetch(`${this.config.issuer}/auth/logout`, {
+      method: "POST",
+      credentials: "include"
+    }).catch(() => void 0);
+    if (options.redirectTo) {
+      window.location.href = options.redirectTo;
+    }
+  }
   async revokeToken() {
     if (!this.endpoints) await this.init();
     const refreshToken = this.storage.getRefreshToken();
@@ -451,6 +490,13 @@ var IdaasClient = class {
     }
     return fetch(url, { ...init, headers });
   }
+  async fetchService(serviceKey, url, init) {
+    const token = await this.getServiceToken(serviceKey);
+    if (!token) throw new Error(`No service token available for ${serviceKey}`);
+    const headers = new Headers(init?.headers);
+    headers.set("Authorization", `Bearer ${token}`);
+    return fetch(url, { ...init, headers });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -224,6 +224,7 @@ var IdaasClient = class {
   constructor(config) {
     this.endpoints = null;
     this.userInfo = null;
+    this.serviceTokens = /* @__PURE__ */ new Map();
     this.config = {
       scope: "openid profile email",
       autoDiscovery: true,
@@ -246,6 +247,7 @@ var IdaasClient = class {
         introspection_endpoint: `${this.config.issuer}/oauth2/introspect`
       };
     }
+    await this.getAccessToken();
     return this.getAuthState();
   }
   async discover() {
@@ -362,14 +364,40 @@ var IdaasClient = class {
     return this.userInfo;
   }
   async getAccessToken() {
-    let token = this.storage.getAccessToken();
-    if (token) return token;
-    if (this.storage.isTokenExpired()) {
-      const tokens = await this.refreshToken();
-      if (tokens) return tokens.access_token;
-    }
+    const token = this.storage.getAccessToken();
+    if (token && !this.storage.isTokenExpired()) return token;
+    const tokens = await this.refreshToken();
+    if (tokens) return tokens.access_token;
     return null;
   }
+  async getServiceToken(serviceKey) {
+    if (!this.endpoints) await this.init();
+    const cached = this.serviceTokens.get(serviceKey);
+    if (cached && Date.now() < cached.expiresAt - 6e4) {
+      return cached.accessToken;
+    }
+    const baseToken = await this.getAccessToken();
+    if (!baseToken) return null;
+    const res = await fetch(`${this.config.issuer}/oauth2/business-token`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${baseToken}`
+      },
+      body: JSON.stringify({ service_key: serviceKey })
+    });
+    if (!res.ok) {
+      this.serviceTokens.delete(serviceKey);
+      return null;
+    }
+    const tokenSet = await res.json();
+    this.serviceTokens.set(serviceKey, {
+      accessToken: tokenSet.access_token,
+      expiresAt: Date.now() + tokenSet.expires_in * 1e3,
+      scope: tokenSet.scope
+    });
+    return tokenSet.access_token;
+  }
   getIdToken() {
     return this.storage.getIdToken();
   }
@@ -398,6 +426,17 @@ var IdaasClient = class {
     }
     window.location.href = `${this.endpoints.end_session_endpoint}?${params.toString()}`;
   }
+  async logoutSession(options = {}) {
+    this.storage.clear();
+    this.userInfo = null;
+    await fetch(`${this.config.issuer}/auth/logout`, {
+      method: "POST",
+      credentials: "include"
+    }).catch(() => void 0);
+    if (options.redirectTo) {
+      window.location.href = options.redirectTo;
+    }
+  }
   async revokeToken() {
     if (!this.endpoints) await this.init();
     const refreshToken = this.storage.getRefreshToken();
@@ -421,6 +460,13 @@ var IdaasClient = class {
     }
     return fetch(url, { ...init, headers });
   }
+  async fetchService(serviceKey, url, init) {
+    const token = await this.getServiceToken(serviceKey);
+    if (!token) throw new Error(`No service token available for ${serviceKey}`);
+    const headers = new Headers(init?.headers);
+    headers.set("Authorization", `Bearer ${token}`);
+    return fetch(url, { ...init, headers });
+  }
 };
 export {
   IdaasClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zskj-idaas/sdk",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "IDaaS OIDC Client SDK for browser applications — supports Authorization Code Flow with PKCE, token management, and authenticated fetch.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,6 +26,7 @@
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts --clean",
     "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
+    "test": "vitest run",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -57,9 +58,9 @@
     "not dead",
     "not ie 11"
   ],
-  "dependencies": {},
   "devDependencies": {
     "tsup": "^8.2.0",
-    "typescript": "^5.6.0"
+    "typescript": "^5.6.0",
+    "vitest": "^4.1.7"
   }
 }