@etsoo/appscript 1.5.94 → 1.5.96

package/__tests__/app/CoreApp.ts

@@ -13,7 +13,8 @@ function EnhanceApp<TBase extends DataTypes.MConstructor<TestApp>>(
 
 const appClass = EnhanceApp(TestApp);
 const app = new appClass();
-app.changeCulture(app.settings.cultures[0]);
+
+await app.changeCulture(app.settings.cultures[0]);
 
 test("Test for domain replacement", () => {
   expect(app.settings.endpoint).toBe("http://localhost:9000/api/");

package/__tests__/app/TestApp.ts

@@ -104,9 +104,6 @@ export class TestApp extends CoreApp<
         // Supported regions
         regions: supportedRegions,
 
-        // Browser's time zone
-        timeZone: Utils.getTimeZone(),
-
         // Current country or region
         currentRegion: AddressUtils.getRegion(
           supportedRegions,

package/__tests__/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "ES2020",
+    "target": "ES2022",
+    "module": "ES2022",
     "moduleResolution": "bundler",
     "allowJs": false,
     "skipLibCheck": false,

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

@@ -8,7 +8,7 @@ import { TokenRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
-import { ResetPasswordRQ } from "./rq/ResetPasswordRQ";
+import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
 import { SwitchOrgRQ } from "./rq/SwitchOrgRQ";
 import { AuthRequest } from "./rq/AuthRequest";
@@ -91,7 +91,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    resetPassword(rq: ResetPasswordInputRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Signout
      * @param rq Request data

package/lib/cjs/api/AuthApi.js

@@ -51,7 +51,8 @@ class AuthApi extends BaseApi_1.BaseApi {
         const rq = {
             type,
             openid: this.app.encrypt(openid),
-            deviceId: this.app.deviceId
+            deviceId: this.app.deviceId,
+            region: this.app.region
         };
         return this.api.post("Auth/CheckUserIdentifier", rq, payload);
     }
@@ -164,7 +165,13 @@ class AuthApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     resetPassword(rq, payload) {
-        return this.api.put("Auth/ResetPassword", rq, payload);
+        const data = {
+            ...rq,
+            deviceId: this.app.deviceId,
+            region: this.app.region,
+            timezone: this.app.getTimeZone()
+        };
+        return this.api.put("Auth/ResetPassword", data, payload);
     }
     /**
      * Signout

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

@@ -19,4 +19,9 @@ export type CheckUserIdentifierRQ = {
      * 设备编号
      */
     deviceId: string;
+    /**
+     * Region
+     * 区域
+     */
+    region: string;
 };

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

@@ -9,15 +9,19 @@ export type LoginRQ = LoginIdRQ & {
      */
     pwd: string;
     /**
-     * Organization
+     * Time zone
      */
-    org?: number;
+    timezone: string;
     /**
-     * Time zone
+     * Organization
      */
-    timezone?: string;
+    org?: number;
     /**
      * Authorization request data
      */
     auth?: AuthRequest;
 };
+/**
+ * Login input request data
+ */
+export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;

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

@@ -15,4 +15,12 @@ export type ResetPasswordRQ = {
      * Country or region
      */
     region: string;
+    /**
+     * Time zone
+     */
+    timezone: string;
 };
+/**
+ * Reset password input request data
+ */
+export type ResetPasswordInputRQ = Pick<ResetPasswordRQ, "id" | "password">;

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

@@ -18,7 +18,7 @@ export interface IAppSettings extends IExternalSettings {
      */
     readonly detectedCulture: string;
     /**
-     * Time zone
+     * Time zone, set a static value for all clients
      */
     timeZone?: string;
     /**

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

@@ -543,7 +543,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get time zone
      * @returns Time zone
      */
-    getTimeZone(): string | undefined;
+    getTimeZone(): string;
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/

package/lib/cjs/app/CoreApp.js

@@ -1021,8 +1021,8 @@ class CoreApp {
      * @returns string
      */
     formatDate(input, options, timeZone) {
-        const { currentCulture, timeZone: defaultTimeZone } = this.settings;
-        timeZone ?? (timeZone = defaultTimeZone);
+        const { currentCulture } = this.settings;
+        timeZone ?? (timeZone = this.getTimeZone());
         return shared_1.DateUtils.format(input, currentCulture.name, options, timeZone);
     }
     /**
@@ -1295,8 +1295,7 @@ class CoreApp {
      * @returns Time zone
      */
     getTimeZone() {
-        // settings.timeZone = Utils.getTimeZone()
-        return this.settings.timeZone ?? this.ipData?.timezone;
+        return this.settings.timeZone ?? shared_1.Utils.getTimeZone(this.ipData?.timezone);
     }
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64

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

@@ -489,7 +489,7 @@ export interface IApp {
      * Get time zone
      * @returns Time zone
      */
-    getTimeZone(): string | undefined;
+    getTimeZone(): string;
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/

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

@@ -8,7 +8,7 @@ import { TokenRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
 import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
-import { ResetPasswordRQ } from "./rq/ResetPasswordRQ";
+import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
 import { SwitchOrgRQ } from "./rq/SwitchOrgRQ";
 import { AuthRequest } from "./rq/AuthRequest";
@@ -91,7 +91,7 @@ export declare class AuthApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    resetPassword(rq: ResetPasswordInputRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Signout
      * @param rq Request data

package/lib/mjs/api/AuthApi.js

@@ -48,7 +48,8 @@ export class AuthApi extends BaseApi {
         const rq = {
             type,
             openid: this.app.encrypt(openid),
-            deviceId: this.app.deviceId
+            deviceId: this.app.deviceId,
+            region: this.app.region
         };
         return this.api.post("Auth/CheckUserIdentifier", rq, payload);
     }
@@ -161,7 +162,13 @@ export class AuthApi extends BaseApi {
      * @returns Result
      */
     resetPassword(rq, payload) {
-        return this.api.put("Auth/ResetPassword", rq, payload);
+        const data = {
+            ...rq,
+            deviceId: this.app.deviceId,
+            region: this.app.region,
+            timezone: this.app.getTimeZone()
+        };
+        return this.api.put("Auth/ResetPassword", data, payload);
     }
     /**
      * Signout

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

@@ -19,4 +19,9 @@ export type CheckUserIdentifierRQ = {
      * 设备编号
      */
     deviceId: string;
+    /**
+     * Region
+     * 区域
+     */
+    region: string;
 };

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

@@ -9,15 +9,19 @@ export type LoginRQ = LoginIdRQ & {
      */
     pwd: string;
     /**
-     * Organization
+     * Time zone
      */
-    org?: number;
+    timezone: string;
     /**
-     * Time zone
+     * Organization
      */
-    timezone?: string;
+    org?: number;
     /**
      * Authorization request data
      */
     auth?: AuthRequest;
 };
+/**
+ * Login input request data
+ */
+export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;

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

@@ -15,4 +15,12 @@ export type ResetPasswordRQ = {
      * Country or region
      */
     region: string;
+    /**
+     * Time zone
+     */
+    timezone: string;
 };
+/**
+ * Reset password input request data
+ */
+export type ResetPasswordInputRQ = Pick<ResetPasswordRQ, "id" | "password">;

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

@@ -18,7 +18,7 @@ export interface IAppSettings extends IExternalSettings {
      */
     readonly detectedCulture: string;
     /**
-     * Time zone
+     * Time zone, set a static value for all clients
      */
     timeZone?: string;
     /**

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

@@ -543,7 +543,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get time zone
      * @returns Time zone
      */
-    getTimeZone(): string | undefined;
+    getTimeZone(): string;
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/

package/lib/mjs/app/CoreApp.js

@@ -1018,8 +1018,8 @@ export class CoreApp {
      * @returns string
      */
     formatDate(input, options, timeZone) {
-        const { currentCulture, timeZone: defaultTimeZone } = this.settings;
-        timeZone ?? (timeZone = defaultTimeZone);
+        const { currentCulture } = this.settings;
+        timeZone ?? (timeZone = this.getTimeZone());
         return DateUtils.format(input, currentCulture.name, options, timeZone);
     }
     /**
@@ -1292,8 +1292,7 @@ export class CoreApp {
      * @returns Time zone
      */
     getTimeZone() {
-        // settings.timeZone = Utils.getTimeZone()
-        return this.settings.timeZone ?? this.ipData?.timezone;
+        return this.settings.timeZone ?? Utils.getTimeZone(this.ipData?.timezone);
     }
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64

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

@@ -489,7 +489,7 @@ export interface IApp {
      * Get time zone
      * @returns Time zone
      */
-    getTimeZone(): string | undefined;
+    getTimeZone(): string;
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.94",
+  "version": "1.5.96",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -35,17 +35,17 @@
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.57",
-    "@etsoo/restclient": "^1.1.21",
-    "@etsoo/shared": "^1.2.59",
+    "@etsoo/notificationbase": "^1.1.58",
+    "@etsoo/restclient": "^1.1.23",
+    "@etsoo/shared": "^1.2.60",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.26.7",
     "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/runtime-corejs3": "^7.26.0",
+    "@babel/preset-env": "^7.26.7",
+    "@babel/runtime-corejs3": "^7.26.7",
     "@types/crypto-js": "^4.2.2",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",

package/src/api/AuthApi.ts

@@ -10,7 +10,7 @@ import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
 import { LoginIdRQ } from "./rq/LoginIdRQ";
 import { RefreshTokenRQ } from "./rq/RefreshTokenRQ";
-import { ResetPasswordRQ } from "./rq/ResetPasswordRQ";
+import { ResetPasswordInputRQ, ResetPasswordRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
 import { SwitchOrgRQ } from "./rq/SwitchOrgRQ";
 import { AuthRequest } from "./rq/AuthRequest";
@@ -81,7 +81,8 @@ export class AuthApi extends BaseApi {
     const rq: CheckUserIdentifierRQ = {
       type,
       openid: this.app.encrypt(openid),
-      deviceId: this.app.deviceId
+      deviceId: this.app.deviceId,
+      region: this.app.region
     };
     return this.api.post("Auth/CheckUserIdentifier", rq, payload);
   }
@@ -222,8 +223,14 @@ export class AuthApi extends BaseApi {
    * @param payload Payload
    * @returns Result
    */
-  resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload) {
-    return this.api.put("Auth/ResetPassword", rq, payload);
+  resetPassword(rq: ResetPasswordInputRQ, payload?: ResultPayload) {
+    const data: ResetPasswordRQ = {
+      ...rq,
+      deviceId: this.app.deviceId,
+      region: this.app.region,
+      timezone: this.app.getTimeZone()
+    };
+    return this.api.put("Auth/ResetPassword", data, payload);
   }
 
   /**

package/src/api/rq/CheckUserIdentifierRQ.ts

@@ -22,4 +22,10 @@ export type CheckUserIdentifierRQ = {
    * 设备编号
    */
   deviceId: string;
+
+  /**
+   * Region
+   * 区域
+   */
+  region: string;
 };

package/src/api/rq/LoginRQ.ts

@@ -11,17 +11,22 @@ export type LoginRQ = LoginIdRQ & {
   pwd: string;
 
   /**
-   * Organization
+   * Time zone
    */
-  org?: number;
+  timezone: string;
 
   /**
-   * Time zone
+   * Organization
    */
-  timezone?: string;
+  org?: number;
 
   /**
    * Authorization request data
    */
   auth?: AuthRequest;
 };
+
+/**
+ * Login input request data
+ */
+export type LoginInputRQ = Pick<LoginRQ, "id" | "pwd" | "org" | "auth">;

package/src/api/rq/ResetPasswordRQ.ts

@@ -18,4 +18,14 @@ export type ResetPasswordRQ = {
    * Country or region
    */
   region: string;
+
+  /**
+   * Time zone
+   */
+  timezone: string;
 };
+
+/**
+ * Reset password input request data
+ */
+export type ResetPasswordInputRQ = Pick<ResetPasswordRQ, "id" | "password">;

package/src/app/AppSettings.ts

@@ -22,7 +22,7 @@ export interface IAppSettings extends IExternalSettings {
   readonly detectedCulture: string;
 
   /**
-   * Time zone
+   * Time zone, set a static value for all clients
    */
   timeZone?: string;
 

package/src/app/CoreApp.ts

@@ -1473,8 +1473,8 @@ export abstract class CoreApp<
     options?: DateUtils.FormatOptions,
     timeZone?: string
   ) {
-    const { currentCulture, timeZone: defaultTimeZone } = this.settings;
-    timeZone ??= defaultTimeZone;
+    const { currentCulture } = this.settings;
+    timeZone ??= this.getTimeZone();
     return DateUtils.format(input, currentCulture.name, options, timeZone);
   }
 
@@ -1796,9 +1796,8 @@ export abstract class CoreApp<
    * Get time zone
    * @returns Time zone
    */
-  getTimeZone(): string | undefined {
-    // settings.timeZone = Utils.getTimeZone()
-    return this.settings.timeZone ?? this.ipData?.timezone;
+  getTimeZone() {
+    return this.settings.timeZone ?? Utils.getTimeZone(this.ipData?.timezone);
   }
 
   /**

package/src/app/IApp.ts

@@ -649,7 +649,7 @@ export interface IApp {
    * Get time zone
    * @returns Time zone
    */
-  getTimeZone(): string | undefined;
+  getTimeZone(): string;
 
   /**
    * Hash message, SHA3 or HmacSHA512, 512 as Base64