whio-api-sdk 1.0.165 → 1.0.167

package/dist/src/sdk/sdk.d.ts

@@ -14,6 +14,8 @@ export declare class ApiSDK {
     login(credentials: LoginCredentials): Promise<LoginResponse>;
     logout(): Promise<void>;
     private clearAuth;
+    private isTokenExpired;
+    private refreshAccessToken;
     isAuthenticated(): boolean;
     getCurrentUser(): User | null;
     getAccessToken(): string | null;

package/dist/src/sdk/sdk.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 // sdk.ts
 import { OrganizationRoleType, } from './types';
 import urls from './urls';
+import { jwtDecode } from 'jwt-decode';
 export class ApiSDK {
     constructor(config = {}) {
         this.accessToken = null;
@@ -39,11 +40,22 @@ export class ApiSDK {
             if (!this.accessToken) {
                 throw new Error('Access token not found');
             }
+            // Check if token is expired or expiring soon
+            if (this.isTokenExpired(this.accessToken)) {
+                // Try to refresh the token
+                if (this.refreshToken) {
+                    yield this.refreshAccessToken();
+                }
+                else {
+                    throw new Error('Access token expired and no refresh token available');
+                }
+            }
         });
     }
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
             this.accessToken = yield this.storage.getItem('access_token');
+            this.refreshToken = yield this.storage.getItem('refresh_token');
             const userString = yield this.storage.getItem('user');
             this.user = userString ? JSON.parse(userString) : null;
         });
@@ -108,6 +120,7 @@ export class ApiSDK {
                 this.refreshToken = response.refresh_token;
                 this.user = response.user;
                 yield this.storage.setItem('access_token', response.access_token);
+                yield this.storage.setItem('refresh_token', response.refresh_token);
                 yield this.storage.setItem('user', JSON.stringify(response.user));
                 return response;
             }
@@ -119,22 +132,52 @@ export class ApiSDK {
     }
     logout() {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.request('/auth/logout', 'POST');
-            }
-            finally {
-                yield this.clearAuth();
-            }
+            yield this.clearAuth();
         });
     }
     clearAuth() {
         return __awaiter(this, void 0, void 0, function* () {
             this.accessToken = null;
+            this.refreshToken = null;
             this.user = null;
             yield this.storage.removeItem('access_token');
+            yield this.storage.removeItem('refresh_token');
             yield this.storage.removeItem('user');
         });
     }
+    isTokenExpired(token, bufferMinutes = 5) {
+        try {
+            const decoded = jwtDecode(token);
+            const currentTime = Date.now() / 1000;
+            const bufferTime = bufferMinutes * 60;
+            return decoded.exp <= (currentTime + bufferTime);
+        }
+        catch (error) {
+            // If we can't decode the token, consider it expired
+            return true;
+        }
+    }
+    refreshAccessToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.refreshToken) {
+                throw new Error('No refresh token available');
+            }
+            try {
+                const response = yield this.request('/auth/refresh', 'POST', { refresh_token: this.refreshToken }, {}, true // Skip token validation for this request
+                );
+                this.accessToken = response.access_token;
+                this.refreshToken = response.refresh_token;
+                this.user = response.user;
+                yield this.storage.setItem('access_token', response.access_token);
+                yield this.storage.setItem('refresh_token', response.refresh_token);
+                yield this.storage.setItem('user', JSON.stringify(response.user));
+            }
+            catch (error) {
+                yield this.clearAuth();
+                throw new Error('Failed to refresh access token');
+            }
+        });
+    }
     isAuthenticated() {
         return !!this.accessToken;
     }

package/dist/src/sdk/urls.js

@@ -3,7 +3,7 @@ const urls = {
     login: '/auth/login',
     profile: '/auth/profile',
     register: '/auth/register',
-    refreshToken: '/auth/refresh-token',
+    refreshToken: '/auth/refresh',
     logout: '/auth/logout',
     changePassword: '/auth/change-password',
     adminChangePassword: '/auth/admin/change-password',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whio-api-sdk",
-  "version": "1.0.165",
+  "version": "1.0.167",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/sdk/sdk.ts

@@ -39,7 +39,7 @@ import {
   UpdateSessionDto,
 } from './types';
 import urls from './urls';
-import jwtDecode from 'jwt-decode';
+import { jwtDecode } from 'jwt-decode';
 
 export class ApiSDK {
   private baseUrl: string;
@@ -70,13 +70,25 @@ export class ApiSDK {
 
   private async getToken() {
     this.accessToken = await this.storage!.getItem('access_token');
+    
     if (!this.accessToken) {
       throw new Error('Access token not found');
     }
+
+    // Check if token is expired or expiring soon
+    if (this.isTokenExpired(this.accessToken)) {
+      // Try to refresh the token
+      if (this.refreshToken) {
+        await this.refreshAccessToken();
+      } else {
+        throw new Error('Access token expired and no refresh token available');
+      }
+    }
   } 
 
   private async initialize() {
     this.accessToken = await this.storage!.getItem('access_token');
+    this.refreshToken = await this.storage!.getItem('refresh_token');
     const userString = await this.storage!.getItem('user');
     this.user = userString ? JSON.parse(userString) : null;
   }
@@ -169,6 +181,7 @@ export class ApiSDK {
       this.user = response.user;
 
       await this.storage!.setItem('access_token', response.access_token);
+      await this.storage!.setItem('refresh_token', response.refresh_token);
       await this.storage!.setItem('user', JSON.stringify(response.user));
 
       return response;
@@ -179,20 +192,58 @@ export class ApiSDK {
   }
 
   public async logout(): Promise<void> {
-    try {
-      await this.request('/auth/logout', 'POST');
-    } finally {
-      await this.clearAuth();
-    }
+    await this.clearAuth();
   }
 
   private async clearAuth(): Promise<void> {
     this.accessToken = null;
+    this.refreshToken = null;
     this.user = null;
     await this.storage!.removeItem('access_token');
+    await this.storage!.removeItem('refresh_token');
     await this.storage!.removeItem('user');
   }
 
+  private isTokenExpired(token: string, bufferMinutes: number = 5): boolean {
+    try {
+      const decoded: any = jwtDecode(token);
+      const currentTime = Date.now() / 1000;
+      const bufferTime = bufferMinutes * 60;
+      
+      return decoded.exp <= (currentTime + bufferTime);
+    } catch (error) {
+      // If we can't decode the token, consider it expired
+      return true;
+    }
+  }
+
+  private async refreshAccessToken(): Promise<void> {
+    if (!this.refreshToken) {
+      throw new Error('No refresh token available');
+    }
+
+    try {
+      const response = await this.request<LoginResponse>(
+        '/auth/refresh',
+        'POST',
+        { refresh_token: this.refreshToken },
+        {},
+        true // Skip token validation for this request
+      );
+
+      this.accessToken = response.access_token;
+      this.refreshToken = response.refresh_token;
+      this.user = response.user;
+
+      await this.storage!.setItem('access_token', response.access_token);
+      await this.storage!.setItem('refresh_token', response.refresh_token);
+      await this.storage!.setItem('user', JSON.stringify(response.user));
+    } catch (error) {
+      await this.clearAuth();
+      throw new Error('Failed to refresh access token');
+    }
+  }
+
   public isAuthenticated(): boolean {
     return !!this.accessToken;
   }

package/src/sdk/urls.ts

@@ -3,7 +3,7 @@ const urls = {
   login: '/auth/login',
   profile: '/auth/profile',
   register: '/auth/register',
-  refreshToken: '/auth/refresh-token',
+  refreshToken: '/auth/refresh',
   logout: '/auth/logout',
   changePassword: '/auth/change-password',
   adminChangePassword: '/auth/admin/change-password',