@lanonasis/oauth-client 1.0.0 → 1.0.2

package/dist/index.cjs

@@ -378,7 +378,11 @@ var TokenStorage = class {
     }
   }
   async store(tokens) {
-    const tokenString = JSON.stringify(tokens);
+    const tokensWithTimestamp = {
+      ...tokens,
+      issued_at: Date.now()
+    };
+    const tokenString = JSON.stringify(tokensWithTimestamp);
     if (this.isNode()) {
       if (this.keytar) {
         await this.keytar.setPassword("lanonasis-mcp", "tokens", tokenString);
@@ -386,7 +390,7 @@ var TokenStorage = class {
         await this.storeToFile(tokenString);
       }
     } else if (this.isElectron()) {
-      await window.electronAPI.secureStore.set(this.storageKey, tokens);
+      await window.electronAPI.secureStore.set(this.storageKey, tokensWithTimestamp);
     } else if (this.isMobile()) {
       await window.SecureStorage.set(this.storageKey, tokenString);
     } else {
@@ -437,15 +441,14 @@ var TokenStorage = class {
   }
   isTokenExpired(tokens) {
     if (!tokens.expires_in) return false;
-    const storedAt = this.getStoredAt(tokens);
-    if (!storedAt) return true;
-    const expiresAt = storedAt + tokens.expires_in * 1e3;
+    if (!tokens.issued_at) {
+      console.warn("Token missing issued_at timestamp, treating as expired");
+      return true;
+    }
+    const expiresAt = tokens.issued_at + tokens.expires_in * 1e3;
     const now = Date.now();
     return expiresAt - now < 3e5;
   }
-  getStoredAt(tokens) {
-    return Date.now() - 36e5;
-  }
   async storeToFile(tokenString) {
     if (!this.isNode()) return;
     const fs = require("fs").promises;
@@ -1118,6 +1121,29 @@ var MCPClient = class {
     await this.tokenStorage.store(tokens);
     return tokens;
   }
+  async ensureAccessToken() {
+    if (this.accessToken) return;
+    const tokens = await this.tokenStorage.retrieve();
+    if (!tokens) {
+      throw new Error("Not authenticated");
+    }
+    if (this.tokenStorage.isTokenExpired(tokens)) {
+      if (tokens.refresh_token) {
+        try {
+          const newTokens = await this.authFlow.refreshToken(tokens.refresh_token);
+          await this.tokenStorage.store(newTokens);
+          this.accessToken = newTokens.access_token;
+          return;
+        } catch (error) {
+          console.error("Token refresh failed:", error);
+          throw new Error("Token expired and refresh failed");
+        }
+      } else {
+        throw new Error("Token expired and no refresh token available");
+      }
+    }
+    this.accessToken = tokens.access_token;
+  }
   scheduleTokenRefresh(tokens) {
     if (this.refreshTimer) {
       clearTimeout(this.refreshTimer);
@@ -1225,6 +1251,7 @@ var MCPClient = class {
     await this.establishConnection();
   }
   async request(method, params) {
+    await this.ensureAccessToken();
     if (!this.accessToken) {
       throw new Error("Not authenticated");
     }

package/dist/index.d.cts

@@ -1,9 +1,10 @@
 interface TokenResponse {
     access_token: string;
-    token_type: string;
-    expires_in: number;
     refresh_token?: string;
-    scope: string;
+    expires_in: number;
+    token_type: string;
+    scope?: string;
+    issued_at?: number;
 }
 interface DeviceCodeResponse {
     device_code: string;
@@ -77,8 +78,9 @@ declare class TokenStorage {
     store(tokens: TokenResponse): Promise<void>;
     retrieve(): Promise<TokenResponse | null>;
     clear(): Promise<void>;
-    isTokenExpired(tokens: TokenResponse): boolean;
-    private getStoredAt;
+    isTokenExpired(tokens: TokenResponse & {
+        issued_at?: number;
+    }): boolean;
     private storeToFile;
     private retrieveFromFile;
     private deleteFile;
@@ -182,6 +184,7 @@ declare class MCPClient {
     constructor(config?: MCPClientConfig);
     connect(): Promise<void>;
     private authenticate;
+    private ensureAccessToken;
     private scheduleTokenRefresh;
     private establishConnection;
     private connectWebSocket;

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 interface TokenResponse {
     access_token: string;
-    token_type: string;
-    expires_in: number;
     refresh_token?: string;
-    scope: string;
+    expires_in: number;
+    token_type: string;
+    scope?: string;
+    issued_at?: number;
 }
 interface DeviceCodeResponse {
     device_code: string;
@@ -77,8 +78,9 @@ declare class TokenStorage {
     store(tokens: TokenResponse): Promise<void>;
     retrieve(): Promise<TokenResponse | null>;
     clear(): Promise<void>;
-    isTokenExpired(tokens: TokenResponse): boolean;
-    private getStoredAt;
+    isTokenExpired(tokens: TokenResponse & {
+        issued_at?: number;
+    }): boolean;
     private storeToFile;
     private retrieveFromFile;
     private deleteFile;
@@ -182,6 +184,7 @@ declare class MCPClient {
     constructor(config?: MCPClientConfig);
     connect(): Promise<void>;
     private authenticate;
+    private ensureAccessToken;
     private scheduleTokenRefresh;
     private establishConnection;
     private connectWebSocket;

package/dist/index.js

@@ -344,7 +344,11 @@ var TokenStorage = class {
     }
   }
   async store(tokens) {
-    const tokenString = JSON.stringify(tokens);
+    const tokensWithTimestamp = {
+      ...tokens,
+      issued_at: Date.now()
+    };
+    const tokenString = JSON.stringify(tokensWithTimestamp);
     if (this.isNode()) {
       if (this.keytar) {
         await this.keytar.setPassword("lanonasis-mcp", "tokens", tokenString);
@@ -352,7 +356,7 @@ var TokenStorage = class {
         await this.storeToFile(tokenString);
       }
     } else if (this.isElectron()) {
-      await window.electronAPI.secureStore.set(this.storageKey, tokens);
+      await window.electronAPI.secureStore.set(this.storageKey, tokensWithTimestamp);
     } else if (this.isMobile()) {
       await window.SecureStorage.set(this.storageKey, tokenString);
     } else {
@@ -403,15 +407,14 @@ var TokenStorage = class {
   }
   isTokenExpired(tokens) {
     if (!tokens.expires_in) return false;
-    const storedAt = this.getStoredAt(tokens);
-    if (!storedAt) return true;
-    const expiresAt = storedAt + tokens.expires_in * 1e3;
+    if (!tokens.issued_at) {
+      console.warn("Token missing issued_at timestamp, treating as expired");
+      return true;
+    }
+    const expiresAt = tokens.issued_at + tokens.expires_in * 1e3;
     const now = Date.now();
     return expiresAt - now < 3e5;
   }
-  getStoredAt(tokens) {
-    return Date.now() - 36e5;
-  }
   async storeToFile(tokenString) {
     if (!this.isNode()) return;
     const fs = __require("fs").promises;
@@ -1084,6 +1087,29 @@ var MCPClient = class {
     await this.tokenStorage.store(tokens);
     return tokens;
   }
+  async ensureAccessToken() {
+    if (this.accessToken) return;
+    const tokens = await this.tokenStorage.retrieve();
+    if (!tokens) {
+      throw new Error("Not authenticated");
+    }
+    if (this.tokenStorage.isTokenExpired(tokens)) {
+      if (tokens.refresh_token) {
+        try {
+          const newTokens = await this.authFlow.refreshToken(tokens.refresh_token);
+          await this.tokenStorage.store(newTokens);
+          this.accessToken = newTokens.access_token;
+          return;
+        } catch (error) {
+          console.error("Token refresh failed:", error);
+          throw new Error("Token expired and refresh failed");
+        }
+      } else {
+        throw new Error("Token expired and no refresh token available");
+      }
+    }
+    this.accessToken = tokens.access_token;
+  }
   scheduleTokenRefresh(tokens) {
     if (this.refreshTimer) {
       clearTimeout(this.refreshTimer);
@@ -1191,6 +1217,7 @@ var MCPClient = class {
     await this.establishConnection();
   }
   async request(method, params) {
+    await this.ensureAccessToken();
     if (!this.accessToken) {
       throw new Error("Not authenticated");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lanonasis/oauth-client",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "description": "OAuth client for Lan Onasis MCP integration",
   "license": "MIT",
@@ -15,13 +15,13 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/lanonasis/lan-onasis-monorepo",
-    "directory": "packages/oauth-client"
+    "url": "git+https://github.com/lanonasis/v-secure.git",
+    "directory": "oauth-client"
   },
   "bugs": {
-    "url": "https://github.com/lanonasis/lan-onasis-monorepo/issues"
+    "url": "https://github.com/lanonasis/v-secure/issues"
   },
-  "homepage": "https://github.com/lanonasis/lan-onasis-monorepo/tree/main/packages/oauth-client",
+  "homepage": "https://github.com/lanonasis/v-secure/tree/main/oauth-client",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",