mezon-js 2.13.39 → 2.13.41

package/client.ts

@@ -511,11 +511,11 @@ export class Client {
       .then((apiSession: ApiSession) => {
         return new Session(
           apiSession.token || "",
-          apiSession.refresh_token || "",
-          apiSession.user_id || "",
+          apiSession.refresh_token || "",          
           apiSession.created || false,
           apiSession.api_url || "",
-          false
+          false,
+          apiSession.user_id,
         );
       });
   }
@@ -571,10 +571,10 @@ export class Client {
         return new Session(
           apiSession.token || "",
           apiSession.refresh_token || "",
-          apiSession.user_id || "",
           apiSession.created || false,          
           apiSession.api_url || "",
           false,
+          apiSession.user_id,
         );
       });
   }
@@ -601,10 +601,10 @@ export class Client {
         return new Session(
           apiSession.token || "",
           apiSession.refresh_token || "",
-          apiSession.user_id || "",
           apiSession.created || false,          
           apiSession.api_url || "",
           false,
+          apiSession.user_id,
         );
       });
   }
@@ -2121,7 +2121,7 @@ export class Client {
             is_remember:session.is_remember
           }
         );
-        session.update(apiSession.token!, apiSession.refresh_token!, apiSession.is_remember || false);
+        session.update(apiSession.token!, apiSession.refresh_token!, apiSession.is_remember || false, apiSession.user_id);
         this.onRefreshSession(apiSession);
         resolve(session);
       } catch (error) {
@@ -3977,10 +3977,10 @@ export class Client {
     return new Session(
       apiSession.token || "",
       apiSession.refresh_token || "",
-      apiSession.user_id || "",
       apiSession.created || false,
       apiSession.api_url || "",
-      apiSession.is_remember || false
+      apiSession.is_remember || false,
+      apiSession.user_id,
     );
   }
 

package/dist/mezon-js.cjs.js

@@ -7207,7 +7207,7 @@ var MezonApi = class {
 
 // session.ts
 var Session = class _Session {
-  constructor(token, refresh_token, user_id, created, api_url, is_remember) {
+  constructor(token, refresh_token, created, api_url, is_remember, user_id) {
     this.created = created;
     this.api_url = api_url;
     this.token = token;
@@ -7215,7 +7215,7 @@ var Session = class _Session {
     this.created_at = Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3);
     this.is_remember = is_remember;
     this.user_id = user_id;
-    this.update(token, refresh_token, is_remember);
+    this.update(token, refresh_token, is_remember, user_id);
   }
   isexpired(currenttime) {
     return this.expires_at - currenttime <= 5;
@@ -7223,7 +7223,7 @@ var Session = class _Session {
   isrefreshexpired(currenttime) {
     return this.refresh_expires_at - currenttime <= 5;
   }
-  update(token, refreshToken, isRemember) {
+  update(token, refreshToken, isRemember, userId) {
     const tokenParts = token.split(".");
     if (tokenParts.length != 3) {
       throw "jwt is not valid.";
@@ -7244,10 +7244,11 @@ var Session = class _Session {
     this.token = token;
     this.expires_at = tokenExpiresAt;
     this.username = tokenDecoded["usn"];
+    this.user_id = userId;
     this.vars = tokenDecoded["vrs"];
   }
-  static restore(token, refreshToken, user_id, api_url, isRemember) {
-    return new _Session(token, refreshToken, user_id, false, api_url, isRemember);
+  static restore(token, refreshToken, api_url, isRemember, user_id) {
+    return new _Session(token, refreshToken, false, api_url, isRemember, user_id);
   }
 };
 
@@ -8576,10 +8577,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        false
+        false,
+        apiSession.user_id
       );
     });
   }
@@ -8615,10 +8616,10 @@ var Client = class {
         return new Session(
           apiSession.token || "",
           apiSession.refresh_token || "",
-          apiSession.user_id || "",
           apiSession.created || false,
           apiSession.api_url || "",
-          false
+          false,
+          apiSession.user_id
         );
       });
     });
@@ -8637,10 +8638,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        false
+        false,
+        apiSession.user_id
       );
     });
   }
@@ -9583,7 +9584,7 @@ var Client = class {
               is_remember: session.is_remember
             }
           );
-          session.update(apiSession.token, apiSession.refresh_token, apiSession.is_remember || false);
+          session.update(apiSession.token, apiSession.refresh_token, apiSession.is_remember || false, apiSession.user_id);
           this.onRefreshSession(apiSession);
           resolve(session);
         } catch (error) {
@@ -10636,10 +10637,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        apiSession.is_remember || false
+        apiSession.is_remember || false,
+        apiSession.user_id
       );
     });
   }

package/dist/mezon-js.esm.mjs

@@ -7173,7 +7173,7 @@ var MezonApi = class {
 
 // session.ts
 var Session = class _Session {
-  constructor(token, refresh_token, user_id, created, api_url, is_remember) {
+  constructor(token, refresh_token, created, api_url, is_remember, user_id) {
     this.created = created;
     this.api_url = api_url;
     this.token = token;
@@ -7181,7 +7181,7 @@ var Session = class _Session {
     this.created_at = Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3);
     this.is_remember = is_remember;
     this.user_id = user_id;
-    this.update(token, refresh_token, is_remember);
+    this.update(token, refresh_token, is_remember, user_id);
   }
   isexpired(currenttime) {
     return this.expires_at - currenttime <= 5;
@@ -7189,7 +7189,7 @@ var Session = class _Session {
   isrefreshexpired(currenttime) {
     return this.refresh_expires_at - currenttime <= 5;
   }
-  update(token, refreshToken, isRemember) {
+  update(token, refreshToken, isRemember, userId) {
     const tokenParts = token.split(".");
     if (tokenParts.length != 3) {
       throw "jwt is not valid.";
@@ -7210,10 +7210,11 @@ var Session = class _Session {
     this.token = token;
     this.expires_at = tokenExpiresAt;
     this.username = tokenDecoded["usn"];
+    this.user_id = userId;
     this.vars = tokenDecoded["vrs"];
   }
-  static restore(token, refreshToken, user_id, api_url, isRemember) {
-    return new _Session(token, refreshToken, user_id, false, api_url, isRemember);
+  static restore(token, refreshToken, api_url, isRemember, user_id) {
+    return new _Session(token, refreshToken, false, api_url, isRemember, user_id);
   }
 };
 
@@ -8542,10 +8543,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        false
+        false,
+        apiSession.user_id
       );
     });
   }
@@ -8581,10 +8582,10 @@ var Client = class {
         return new Session(
           apiSession.token || "",
           apiSession.refresh_token || "",
-          apiSession.user_id || "",
           apiSession.created || false,
           apiSession.api_url || "",
-          false
+          false,
+          apiSession.user_id
         );
       });
     });
@@ -8603,10 +8604,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        false
+        false,
+        apiSession.user_id
       );
     });
   }
@@ -9549,7 +9550,7 @@ var Client = class {
               is_remember: session.is_remember
             }
           );
-          session.update(apiSession.token, apiSession.refresh_token, apiSession.is_remember || false);
+          session.update(apiSession.token, apiSession.refresh_token, apiSession.is_remember || false, apiSession.user_id);
           this.onRefreshSession(apiSession);
           resolve(session);
         } catch (error) {
@@ -10602,10 +10603,10 @@ var Client = class {
       return new Session(
         apiSession.token || "",
         apiSession.refresh_token || "",
-        apiSession.user_id || "",
         apiSession.created || false,
         apiSession.api_url || "",
-        apiSession.is_remember || false
+        apiSession.is_remember || false,
+        apiSession.user_id
       );
     });
   }

package/dist/session.d.ts

@@ -52,9 +52,9 @@ export declare class Session implements ISession {
     user_id?: string;
     vars?: object;
     is_remember?: boolean;
-    constructor(token: string, refresh_token: string, user_id: string, created: boolean, api_url: string, is_remember: boolean);
+    constructor(token: string, refresh_token: string, created: boolean, api_url: string, is_remember: boolean, user_id?: string);
     isexpired(currenttime: number): boolean;
     isrefreshexpired(currenttime: number): boolean;
-    update(token: string, refreshToken: string, isRemember: boolean): void;
-    static restore(token: string, refreshToken: string, user_id: string, api_url: string, isRemember: boolean): Session;
+    update(token: string, refreshToken: string, isRemember: boolean, userId?: string): void;
+    static restore(token: string, refreshToken: string, api_url: string, isRemember: boolean, user_id?: string): Session;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mezon-js",
-  "version": "2.13.39",
+  "version": "2.13.41",
   "scripts": {
     "build": "npx tsc && npx rollup -c --bundleConfigAsCjs && node build.mjs"
   },

package/session.ts

@@ -60,17 +60,17 @@ export class Session implements ISession {
 
   constructor(
     token: string,
-    refresh_token: string,
-    user_id: string,
+    refresh_token: string,    
     readonly created: boolean,
     readonly api_url: string,
-    is_remember: boolean) {
+    is_remember: boolean,
+    user_id?: string) {
     this.token = token;
     this.refresh_token = refresh_token;
     this.created_at = Math.floor(new Date().getTime() / 1000);
     this.is_remember = is_remember;
     this.user_id = user_id;
-    this.update(token, refresh_token, is_remember);
+    this.update(token, refresh_token, is_remember, user_id);
   }
 
   isexpired(currenttime: number): boolean {
@@ -81,7 +81,7 @@ export class Session implements ISession {
       return (this.refresh_expires_at! - currenttime) <= 5;
   }
 
-  update(token: string, refreshToken: string, isRemember: boolean) {
+  update(token: string, refreshToken: string, isRemember: boolean, userId?: string) {
 
     const tokenParts = token.split('.');
     if (tokenParts.length != 3) {
@@ -111,11 +111,11 @@ export class Session implements ISession {
     this.token = token;
     this.expires_at = tokenExpiresAt;
     this.username = tokenDecoded['usn'];
-    //this.user_id = tokenDecoded['uid'];
+    this.user_id = userId;//tokenDecoded['uid'];
     this.vars = tokenDecoded['vrs'];
   }
 
-  static restore(token: string, refreshToken: string, user_id: string, api_url: string, isRemember: boolean): Session {
-    return new Session(token, refreshToken, user_id, false, api_url, isRemember);
+  static restore(token: string, refreshToken: string, api_url: string, isRemember: boolean, user_id?: string): Session {
+    return new Session(token, refreshToken, false, api_url, isRemember, user_id);
   }
 }