glitch-javascript-sdk 2.6.7 → 2.6.8

package/dist/esm/util/Session.d.ts

@@ -15,6 +15,7 @@ declare class Session {
     static processAuthentication(data: {
         token: {
             access_token: string;
+            expires_in: number;
         };
         id: string;
         first_name: string;

package/dist/esm/util/Storage.d.ts

@@ -16,5 +16,8 @@ declare class Storage {
     static eraseCookie(name: string): void;
     private static setCookie;
     private static getCookie;
+    static setTokenExpiry(expiresInSeconds: number): void;
+    static getTokenExpiry(): number | null;
+    static isTokenExpired(): boolean;
 }
 export default Storage;

package/dist/index.d.ts

@@ -7417,6 +7417,7 @@ declare class Session {
     static processAuthentication(data: {
         token: {
             access_token: string;
+            expires_in: number;
         };
         id: string;
         first_name: string;
@@ -7452,6 +7453,9 @@ declare class Storage {
     static eraseCookie(name: string): void;
     private static setCookie;
     private static getCookie;
+    static setTokenExpiry(expiresInSeconds: number): void;
+    static getTokenExpiry(): number | null;
+    static isTokenExpired(): boolean;
 }
 
 declare class Data {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glitch-javascript-sdk",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Javascript SDK for Glitch",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/util/Session.ts

@@ -21,7 +21,7 @@ class BrowserCrypto implements CryptoInterface {
 
   createHmac(algorithm: string, secret: string): HmacInterface {
     let data = '';
-    
+
     const hmac: HmacInterface = {
       update: (updateData: string): HmacInterface => {
         data = updateData;
@@ -34,7 +34,7 @@ class BrowserCrypto implements CryptoInterface {
         return this.CryptoJS.HmacSHA256(data, secret).toString(this.CryptoJS.enc.Hex);
       }
     };
-    
+
     return hmac;
   }
 }
@@ -94,9 +94,17 @@ class Session {
 
   public static isLoggedIn(): boolean {
     const authToken = Storage.getAuthToken();
+    const expired = Storage.isTokenExpired();
+
+    if (expired) {
+      Session.end(); // Auto-clear if expired
+      return false;
+    }
+
     return authToken !== null && authToken !== 'null' && authToken !== undefined;
   }
 
+
   public static getAuthToken(): string | null {
     return Storage.getAuthToken();
   }
@@ -124,6 +132,8 @@ class Session {
 
   public static end(): void {
     Storage.setAuthToken(null);
+    Storage.set('glitch_token_expiry', null); // Clear expiry
+    Storage.eraseCookie('glitch_token_expiry');
     Storage.set(Session._id_key, null);
     Storage.set(Session._first_name_key, null);
     Storage.set(Session._last_name_key, null);
@@ -131,15 +141,17 @@ class Session {
     Storage.set(Session._username_key, null);
   }
 
-  public static processAuthentication(data: { 
-    token: { access_token: string }, 
-    id: string, 
-    first_name: string, 
-    last_name: string, 
-    email: string, 
-    username: string 
+  public static processAuthentication(data: {
+    token: { access_token: string, expires_in: number }, // Added expires_in
+    id: string,
+    first_name: string,
+    last_name: string,
+    email: string,
+    username: string
   }): void {
     Storage.setAuthToken(data.token.access_token);
+    Storage.setTokenExpiry(data.token.expires_in); // Save the timeout
+
     Storage.set(Session._id_key, data.id);
     Storage.set(Session._first_name_key, data.first_name);
     Storage.set(Session._last_name_key, data.last_name);

package/src/util/Storage.ts

@@ -27,7 +27,7 @@ class Storage {
       } catch (e) {
         try {
           this.setCookie(key, value, 31);
-        } catch(e){
+        } catch (e) {
 
         }
         Storage.data[key] = value;
@@ -52,10 +52,10 @@ class Storage {
 
         try {
           value = Storage.getCookie(key);
-        } catch(e) {
+        } catch (e) {
 
         }
-        
+
         if (!value) {
           value = Storage.data[key];
         }
@@ -67,11 +67,11 @@ class Storage {
   public static setAuthToken(token: string | null) {
     // Always set the cookie if we have a root domain to ensure cross-subdomain sync
     if (Storage.rootDomain) {
-        if (token) {
-            this.setCookie('glitch_auth_token', token, 31);
-        } else {
-            this.eraseCookie('glitch_auth_token');
-        }
+      if (token) {
+        this.setCookie('glitch_auth_token', token, 31);
+      } else {
+        this.eraseCookie('glitch_auth_token');
+      }
     }
     // Still set localStorage for the current domain
     Storage.set('glitch_auth_token', token);
@@ -80,22 +80,22 @@ class Storage {
   public static getAuthToken(): string | null {
     // 1. Try Cookie first (best for cross-subdomain)
     let token = Storage.getCookie('glitch_auth_token');
-    
+
     // 2. Fallback to LocalStorage
     if (!token || token === 'null') {
-        token = Storage.get('glitch_auth_token');
+      token = Storage.get('glitch_auth_token');
     }
-    
+
     return (token === 'null' || !token) ? null : token;
   }
 
   public static eraseCookie(name: string) {
 
-    if(document){
+    if (document) {
       document.cookie =
         name +
         '=; Secure; HttpOnly=false; SameSite=none; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
-      }
+    }
   }
 
   private static setCookie(name: string, value: string, days: number) {
@@ -115,12 +115,12 @@ class Storage {
         expires +
         '; path=/; domain=' +
         Storage.rootDomain +
-        '; SameSite=Lax; Secure'; 
+        '; SameSite=Lax; Secure';
     }
   }
 
   private static getCookie(name: string): string | null {
-    if(document){
+    if (document) {
       const nameEQ = name + '=';
       const ca = document.cookie.split(';');
       for (let i = 0; i < ca.length; i++) {
@@ -131,6 +131,31 @@ class Storage {
     }
     return null;
   }
+
+  public static setTokenExpiry(expiresInSeconds: number) {
+    const expiryTime = Date.now() + (expiresInSeconds * 1000);
+    Storage.set('glitch_token_expiry', expiryTime);
+
+    // Also set a cookie for cross-subdomain consistency if rootDomain exists
+    if (Storage.rootDomain && typeof document !== 'undefined') {
+      this.setCookie('glitch_token_expiry', expiryTime.toString(), 31);
+    }
+  }
+
+  public static getTokenExpiry(): number | null {
+    let expiry = Storage.getCookie('glitch_token_expiry');
+    if (!expiry) {
+      expiry = Storage.get('glitch_token_expiry');
+    }
+    return expiry ? parseInt(expiry) : null;
+  }
+
+  public static isTokenExpired(): boolean {
+    const expiry = this.getTokenExpiry();
+    if (!expiry) return false; // If no expiry set, assume valid or let API handle 401
+
+    return Date.now() > expiry;
+  }
 }
 
 export default Storage;