@etsoo/appscript 1.5.97 → 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

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

@@ -1,8 +1,8 @@
-import { TokenRQ } from "./TokenRQ";
+import { TokenInputRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = TokenRQ & {
+export type ApiRefreshTokenRQ = TokenInputRQ & {
     /**
      * Application ID, 0 for core system
      */

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

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

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, timeZone: rq.timeZone, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, 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 = { timeZone: this.getTimeZone() });
+        props ?? (props = {});
         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, timeZone: this.getTimeZone() }, {
+        const data = await this.createAuthApi().exchangeToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1610,8 +1610,6 @@ class CoreApp {
                 return;
             // App id
             const appId = this.settings.appId;
-            // Timezone
-            const timeZone = this.getTimeZone();
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1624,7 +1622,7 @@ class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], { appId, token: api[4], timeZone }).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/cjs/app/IApp.d.ts

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

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

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

@@ -1,8 +1,8 @@
-import { TokenRQ } from "./TokenRQ";
+import { TokenInputRQ } from "./TokenRQ";
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = TokenRQ & {
+export type ApiRefreshTokenRQ = TokenInputRQ & {
     /**
      * Application ID, 0 for core system
      */

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

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

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, timeZone: rq.timeZone, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, 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 = { timeZone: this.getTimeZone() });
+        props ?? (props = {});
         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, timeZone: this.getTimeZone() }, {
+        const data = await this.createAuthApi().exchangeToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1607,8 +1607,6 @@ export class CoreApp {
                 return;
             // App id
             const appId = this.settings.appId;
-            // Timezone
-            const timeZone = this.getTimeZone();
             // APIs
             for (const name in this.apis) {
                 // Get the API
@@ -1621,7 +1619,7 @@ export class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], { appId, token: api[4], timeZone }).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/app/IApp.d.ts

@@ -85,10 +85,6 @@ 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.97",
+  "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);
   }
 
   /**

package/src/api/rq/ApiRefreshTokenRQ.ts

@@ -1,9 +1,9 @@
-import { TokenRQ } from "./TokenRQ";
+import { TokenInputRQ } from "./TokenRQ";
 
 /**
  * API Refresh Token Request data
  */
-export type ApiRefreshTokenRQ = TokenRQ & {
+export type ApiRefreshTokenRQ = TokenInputRQ & {
   /**
    * Application ID, 0 for core system
    */

package/src/api/rq/TokenRQ.ts

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

package/src/app/CoreApp.ts

@@ -352,7 +352,7 @@ export abstract class CoreApp<
       if (this.lastCalled) {
         // Call refreshToken to update access token
         await this.refreshToken(
-          { token: rq.token, timeZone: rq.timeZone, showLoading: false },
+          { token: rq.token, 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 ??= { timeZone: this.getTimeZone() };
+    props ??= {};
     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, timeZone: this.getTimeZone() },
+      { token },
       {
         showLoading: false,
         onError: (error) => {
@@ -2165,9 +2165,6 @@ export abstract class CoreApp<
       // App id
       const appId = this.settings.appId;
 
-      // Timezone
-      const timeZone = this.getTimeZone();
-
       // APIs
       for (const name in this.apis) {
         // Get the API
@@ -2182,7 +2179,7 @@ export abstract class CoreApp<
         // Ready to trigger
         if (api[2] === 0) {
           // Refresh token
-          api[3](api[0], { appId, token: api[4], timeZone }).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/src/app/IApp.ts

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