@etsoo/appscript 1.5.96 → 1.5.97

package/lib/cjs/api/AuthApi.js

@@ -106,7 +106,8 @@ class AuthApi extends BaseApi_1.BaseApi {
         const rq = {
             id,
             deviceId,
-            region
+            region,
+            timeZone: this.app.getTimeZone()
         };
         return this.api.post("Auth/LoginId", rq, payload);
     }
@@ -129,7 +130,8 @@ class AuthApi extends BaseApi_1.BaseApi {
         }
         // Reqest data
         const rq = {
-            deviceId: this.app.deviceId
+            deviceId: this.app.deviceId,
+            timeZone: this.app.getTimeZone()
         };
         // Payload
         const payload = {

package/lib/cjs/api/rq/ApiRefreshTokenRQ.d.ts

@@ -1,13 +1,10 @@
+import { TokenRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-    /**
-     * Refresh token
-     */
-    token: string;
+export type ApiRefreshTokenRQ = TokenRQ & {
     /**
      * Application ID, 0 for core system
      */
-    appId?: number;
+    appId: number;
 };

package/lib/cjs/api/rq/LoginIdRQ.d.ts

@@ -14,4 +14,8 @@ export type LoginIdRQ = {
      * Country or region
      */
     region: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/cjs/api/rq/LoginRQ.d.ts

@@ -8,10 +8,6 @@ export type LoginRQ = LoginIdRQ & {
      * Password
      */
     pwd: string;
-    /**
-     * Time zone
-     */
-    timezone: string;
     /**
      * Organization
      */

package/lib/cjs/api/rq/RefreshTokenRQ.d.ts

@@ -6,4 +6,8 @@ export type RefreshTokenRQ = {
      * Device id
      */
     deviceId: string;
+    /***
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/cjs/api/rq/TokenRQ.d.ts

@@ -6,4 +6,8 @@ export type TokenRQ = {
      * Refresh token
      */
     token: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/cjs/app/CoreApp.js

@@ -177,7 +177,7 @@ class CoreApp {
         const refresh = async (api, rq) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken({ token: rq.token, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, timeZone: rq.timeZone, showLoading: false }, (result) => {
                     if (result === true)
                         return;
                     console.log(`CoreApp.${this.name}.RefreshToken`, result);
@@ -1420,7 +1420,7 @@ class CoreApp {
      */
     async refreshToken(props, callback) {
         // Check props
-        props ?? (props = {});
+        props ?? (props = { timeZone: this.getTimeZone() });
         props.token ?? (props.token = this.getCacheToken());
         // Call refresh token API
         let data = await this.createAuthApi().refreshToken(props);
@@ -1519,7 +1519,7 @@ class CoreApp {
             throw new Error("System API is not allowed to exchange token");
         }
         // Call the API quietly, no loading bar and no error popup
-        const data = await this.createAuthApi().exchangeToken({ token }, {
+        const data = await this.createAuthApi().exchangeToken({ token, timeZone: this.getTimeZone() }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1608,6 +1608,10 @@ class CoreApp {
             // Exit when not authorized
             if (!this.authorized)
                 return;
+            // App id
+            const appId = this.settings.appId;
+            // Timezone
+            const timeZone = this.getTimeZone();
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1620,7 +1624,7 @@ class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], { token: api[4] }).then((data) => {
+                    api[3](api[0], { appId, token: api[4], timeZone }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

package/lib/cjs/app/IApp.d.ts

@@ -85,6 +85,10 @@ export interface RefreshTokenProps {
      * Refresh token
      */
     token?: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
     /**
      * API URL
      */

package/lib/mjs/api/AuthApi.js

@@ -103,7 +103,8 @@ export class AuthApi extends BaseApi {
         const rq = {
             id,
             deviceId,
-            region
+            region,
+            timeZone: this.app.getTimeZone()
         };
         return this.api.post("Auth/LoginId", rq, payload);
     }
@@ -126,7 +127,8 @@ export class AuthApi extends BaseApi {
         }
         // Reqest data
         const rq = {
-            deviceId: this.app.deviceId
+            deviceId: this.app.deviceId,
+            timeZone: this.app.getTimeZone()
         };
         // Payload
         const payload = {

package/lib/mjs/api/rq/ApiRefreshTokenRQ.d.ts

@@ -1,13 +1,10 @@
+import { TokenRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-    /**
-     * Refresh token
-     */
-    token: string;
+export type ApiRefreshTokenRQ = TokenRQ & {
     /**
      * Application ID, 0 for core system
      */
-    appId?: number;
+    appId: number;
 };

package/lib/mjs/api/rq/LoginIdRQ.d.ts

@@ -14,4 +14,8 @@ export type LoginIdRQ = {
      * Country or region
      */
     region: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/mjs/api/rq/LoginRQ.d.ts

@@ -8,10 +8,6 @@ export type LoginRQ = LoginIdRQ & {
      * Password
      */
     pwd: string;
-    /**
-     * Time zone
-     */
-    timezone: string;
     /**
      * Organization
      */

package/lib/mjs/api/rq/RefreshTokenRQ.d.ts

@@ -6,4 +6,8 @@ export type RefreshTokenRQ = {
      * Device id
      */
     deviceId: string;
+    /***
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/mjs/api/rq/TokenRQ.d.ts

@@ -6,4 +6,8 @@ export type TokenRQ = {
      * Refresh token
      */
     token: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
 };

package/lib/mjs/app/CoreApp.js

@@ -174,7 +174,7 @@ export class CoreApp {
         const refresh = async (api, rq) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken({ token: rq.token, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, timeZone: rq.timeZone, showLoading: false }, (result) => {
                     if (result === true)
                         return;
                     console.log(`CoreApp.${this.name}.RefreshToken`, result);
@@ -1417,7 +1417,7 @@ export class CoreApp {
      */
     async refreshToken(props, callback) {
         // Check props
-        props ?? (props = {});
+        props ?? (props = { timeZone: this.getTimeZone() });
         props.token ?? (props.token = this.getCacheToken());
         // Call refresh token API
         let data = await this.createAuthApi().refreshToken(props);
@@ -1516,7 +1516,7 @@ export class CoreApp {
             throw new Error("System API is not allowed to exchange token");
         }
         // Call the API quietly, no loading bar and no error popup
-        const data = await this.createAuthApi().exchangeToken({ token }, {
+        const data = await this.createAuthApi().exchangeToken({ token, timeZone: this.getTimeZone() }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1605,6 +1605,10 @@ export class CoreApp {
             // Exit when not authorized
             if (!this.authorized)
                 return;
+            // App id
+            const appId = this.settings.appId;
+            // Timezone
+            const timeZone = this.getTimeZone();
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1617,7 +1621,7 @@ export class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], { token: api[4] }).then((data) => {
+                    api[3](api[0], { appId, token: api[4], timeZone }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

package/lib/mjs/app/IApp.d.ts

@@ -85,6 +85,10 @@ export interface RefreshTokenProps {
      * Refresh token
      */
     token?: string;
+    /**
+     * Time zone
+     */
+    timeZone: string;
     /**
      * API URL
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.96",
+  "version": "1.5.97",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/api/AuthApi.ts

@@ -147,7 +147,8 @@ export class AuthApi extends BaseApi {
     const rq: LoginIdRQ = {
       id,
       deviceId,
-      region
+      region,
+      timeZone: this.app.getTimeZone()
     };
     return this.api.post("Auth/LoginId", rq, payload);
   }
@@ -180,7 +181,8 @@ export class AuthApi extends BaseApi {
 
     // Reqest data
     const rq: RefreshTokenRQ = {
-      deviceId: this.app.deviceId
+      deviceId: this.app.deviceId,
+      timeZone: this.app.getTimeZone()
     };
 
     // Payload

package/src/api/rq/ApiRefreshTokenRQ.ts

@@ -1,14 +1,11 @@
+import { TokenRQ } from "./TokenRQ";
+
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-  /**
-   * Refresh token
-   */
-  token: string;
-
+export type ApiRefreshTokenRQ = TokenRQ & {
   /**
    * Application ID, 0 for core system
    */
-  appId?: number;
+  appId: number;
 };

package/src/api/rq/LoginIdRQ.ts

@@ -16,4 +16,9 @@ export type LoginIdRQ = {
    * Country or region
    */
   region: string;
+
+  /**
+   * Time zone
+   */
+  timeZone: string;
 };

package/src/api/rq/LoginRQ.ts

@@ -10,11 +10,6 @@ export type LoginRQ = LoginIdRQ & {
    */
   pwd: string;
 
-  /**
-   * Time zone
-   */
-  timezone: string;
-
   /**
    * Organization
    */

package/src/api/rq/RefreshTokenRQ.ts

@@ -6,4 +6,9 @@ export type RefreshTokenRQ = {
    * Device id
    */
   deviceId: string;
+
+  /***
+   * Time zone
+   */
+  timeZone: string;
 };

package/src/api/rq/TokenRQ.ts

@@ -6,4 +6,9 @@ export type TokenRQ = {
    * Refresh token
    */
   token: string;
+
+  /**
+   * Time zone
+   */
+  timeZone: string;
 };

package/src/app/CoreApp.ts

@@ -61,7 +61,7 @@ type ApiRefreshTokenFunction = (
   rq: ApiRefreshTokenRQ
 ) => Promise<[string, number] | undefined>;
 
-// API task data
+// API task data, [api, token expires in seconds, token expires countdown seconds, app id, refresh token function, token]
 type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 
 // System API name
@@ -352,7 +352,7 @@ export abstract class CoreApp<
       if (this.lastCalled) {
         // Call refreshToken to update access token
         await this.refreshToken(
-          { token: rq.token, showLoading: false },
+          { token: rq.token, timeZone: rq.timeZone, showLoading: false },
           (result) => {
             if (result === true) return;
             console.log(`CoreApp.${this.name}.RefreshToken`, result);
@@ -1938,7 +1938,7 @@ export abstract class CoreApp<
     callback?: (result?: boolean | IActionResult) => boolean | void
   ) {
     // Check props
-    props ??= {};
+    props ??= { timeZone: this.getTimeZone() };
     props.token ??= this.getCacheToken();
 
     // Call refresh token API
@@ -2052,7 +2052,7 @@ export abstract class CoreApp<
 
     // Call the API quietly, no loading bar and no error popup
     const data = await this.createAuthApi().exchangeToken(
-      { token },
+      { token, timeZone: this.getTimeZone() },
       {
         showLoading: false,
         onError: (error) => {
@@ -2162,6 +2162,12 @@ export abstract class CoreApp<
       // Exit when not authorized
       if (!this.authorized) return;
 
+      // App id
+      const appId = this.settings.appId;
+
+      // Timezone
+      const timeZone = this.getTimeZone();
+
       // APIs
       for (const name in this.apis) {
         // Get the API
@@ -2176,7 +2182,7 @@ export abstract class CoreApp<
         // Ready to trigger
         if (api[2] === 0) {
           // Refresh token
-          api[3](api[0], { token: api[4] }).then((data) => {
+          api[3](api[0], { appId, token: api[4], timeZone }).then((data) => {
             if (data == null) {
               // Failed, try it again in 2 seconds
               api[2] = 2;

package/src/app/IApp.ts

@@ -114,6 +114,11 @@ export interface RefreshTokenProps {
    */
   token?: string;
 
+  /**
+   * Time zone
+   */
+  timeZone: string;
+
   /**
    * API URL
    */