@etsoo/appscript 1.5.96 → 1.5.98

package/lib/cjs/api/AuthApi.d.ts

@@ -4,7 +4,7 @@ import { BaseApi } from "./BaseApi";
 import { ResultPayload } from "./dto/ResultPayload";
 import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
-import { TokenRQ } from "./rq/TokenRQ";
+import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
@@ -27,7 +27,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    apiRefreshToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Authorization request
      * @param auth Authorization request data
@@ -56,7 +56,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
      * @param rq Request data

package/lib/cjs/api/AuthApi.js

@@ -14,7 +14,8 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     apiRefreshToken(rq, payload) {
-        return this.api.put("Auth/ApiRefreshToken", rq, payload);
+        const data = { ...rq, timeZone: this.app.getTimeZone() };
+        return this.api.put("Auth/ApiRefreshToken", data, payload);
     }
     /**
      * Authorization request
@@ -63,7 +64,8 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     exchangeToken(rq, payload) {
-        return this.api.put("Auth/ExchangeToken", rq, payload);
+        const data = { ...rq, timeZone: this.app.getTimeZone() };
+        return this.api.put("Auth/ExchangeToken", data, payload);
     }
     /**
      * Get log in url
@@ -106,7 +108,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 +132,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 { TokenInputRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-    /**
-     * Refresh token
-     */
-    token: string;
+export type ApiRefreshTokenRQ = TokenInputRQ & {
     /**
      * 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

@@ -1,9 +1,18 @@
 /**
  * Token request data
  */
-export type TokenRQ = {
+export type TokenInputRQ = {
     /**
      * Refresh token
      */
     token: string;
 };
+/**
+ * Token request data
+ */
+export type TokenRQ = TokenInputRQ & {
+    /**
+     * Time zone
+     */
+    timeZone: string;
+};

package/lib/cjs/app/CoreApp.js

@@ -1608,6 +1608,8 @@ class CoreApp {
             // Exit when not authorized
             if (!this.authorized)
                 return;
+            // App id
+            const appId = this.settings.appId;
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1620,7 +1622,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] }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

package/lib/mjs/api/AuthApi.d.ts

@@ -4,7 +4,7 @@ import { BaseApi } from "./BaseApi";
 import { ResultPayload } from "./dto/ResultPayload";
 import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
-import { TokenRQ } from "./rq/TokenRQ";
+import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
@@ -27,7 +27,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    apiRefreshToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Authorization request
      * @param auth Authorization request data
@@ -56,7 +56,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
      * @param rq Request data

package/lib/mjs/api/AuthApi.js

@@ -11,7 +11,8 @@ export class AuthApi extends BaseApi {
      * @returns Result
      */
     apiRefreshToken(rq, payload) {
-        return this.api.put("Auth/ApiRefreshToken", rq, payload);
+        const data = { ...rq, timeZone: this.app.getTimeZone() };
+        return this.api.put("Auth/ApiRefreshToken", data, payload);
     }
     /**
      * Authorization request
@@ -60,7 +61,8 @@ export class AuthApi extends BaseApi {
      * @returns Result
      */
     exchangeToken(rq, payload) {
-        return this.api.put("Auth/ExchangeToken", rq, payload);
+        const data = { ...rq, timeZone: this.app.getTimeZone() };
+        return this.api.put("Auth/ExchangeToken", data, payload);
     }
     /**
      * Get log in url
@@ -103,7 +105,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 +129,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 { TokenInputRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-    /**
-     * Refresh token
-     */
-    token: string;
+export type ApiRefreshTokenRQ = TokenInputRQ & {
     /**
      * 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

@@ -1,9 +1,18 @@
 /**
  * Token request data
  */
-export type TokenRQ = {
+export type TokenInputRQ = {
     /**
      * Refresh token
      */
     token: string;
 };
+/**
+ * Token request data
+ */
+export type TokenRQ = TokenInputRQ & {
+    /**
+     * Time zone
+     */
+    timeZone: string;
+};

package/lib/mjs/app/CoreApp.js

@@ -1605,6 +1605,8 @@ export class CoreApp {
             // Exit when not authorized
             if (!this.authorized)
                 return;
+            // App id
+            const appId = this.settings.appId;
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1617,7 +1619,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] }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.96",
+  "version": "1.5.98",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -42,14 +42,14 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.7",
-    "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/core": "^7.26.8",
+    "@babel/plugin-transform-runtime": "^7.26.8",
+    "@babel/preset-env": "^7.26.8",
     "@babel/runtime-corejs3": "^7.26.7",
     "@types/crypto-js": "^4.2.2",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.4"
+    "vitest": "^3.0.5"
   }
 }

package/src/api/AuthApi.ts

@@ -4,7 +4,7 @@ import { BaseApi } from "./BaseApi";
 import { ResultPayload } from "./dto/ResultPayload";
 import { ActionResult, DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
-import { TokenRQ } from "./rq/TokenRQ";
+import { TokenInputRQ, TokenRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
@@ -32,8 +32,9 @@ export class AuthApi extends BaseApi {
    * @param payload Payload
    * @returns Result
    */
-  apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
-    return this.api.put("Auth/ApiRefreshToken", rq, payload);
+  apiRefreshToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
+    const data: TokenRQ = { ...rq, timeZone: this.app.getTimeZone() };
+    return this.api.put("Auth/ApiRefreshToken", data, payload);
   }
 
   /**
@@ -93,8 +94,9 @@ export class AuthApi extends BaseApi {
    * @param payload Payload
    * @returns Result
    */
-  exchangeToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
-    return this.api.put("Auth/ExchangeToken", rq, payload);
+  exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>) {
+    const data: TokenRQ = { ...rq, timeZone: this.app.getTimeZone() };
+    return this.api.put("Auth/ExchangeToken", data, payload);
   }
 
   /**
@@ -147,7 +149,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 +183,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 { TokenInputRQ } from "./TokenRQ";
+
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = {
-  /**
-   * Refresh token
-   */
-  token: string;
-
+export type ApiRefreshTokenRQ = TokenInputRQ & {
   /**
    * 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

@@ -1,9 +1,19 @@
 /**
  * Token request data
  */
-export type TokenRQ = {
+export type TokenInputRQ = {
   /**
    * Refresh token
    */
   token: string;
 };
+
+/**
+ * Token request data
+ */
+export type TokenRQ = TokenInputRQ & {
+  /**
+   * 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
@@ -2162,6 +2162,9 @@ export abstract class CoreApp<
       // Exit when not authorized
       if (!this.authorized) return;
 
+      // App id
+      const appId = this.settings.appId;
+
       // APIs
       for (const name in this.apis) {
         // Get the API
@@ -2176,7 +2179,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] }).then((data) => {
             if (data == null) {
               // Failed, try it again in 2 seconds
               api[2] = 2;