@etsoo/appscript 1.3.47 → 1.3.48

package/lib/cjs/address/AddressRegion.js

@@ -32,17 +32,17 @@ exports.AddressRegion = AddressRegion;
 /**
  * CN - China
  */
-AddressRegion.CN = new AddressRegion('CN', 'CHN', '156', AddressContinent_1.AddressContinent.AS, '00', '+86', '0', 'CNY', ['zh-CN']);
+AddressRegion.CN = new AddressRegion('CN', 'CHN', '156', AddressContinent_1.AddressContinent.AS, '00', '+86', '0', 'CNY', ['zh-Hans-CN', 'zh-CN']);
 /**
  * HK - HK, China
  * 中国香港
  */
-AddressRegion.HK = new AddressRegion('HK', 'HKG', '344', AddressContinent_1.AddressContinent.AS, '001', '+852', undefined, 'HKD', ['zh-HK', 'en-HK']);
+AddressRegion.HK = new AddressRegion('HK', 'HKG', '344', AddressContinent_1.AddressContinent.AS, '001', '+852', undefined, 'HKD', ['zh-Hant-HK', 'zh-HK', 'en-HK']);
 /**
  * SG - Singapore
  * 新加坡
  */
-AddressRegion.SG = new AddressRegion('SG', 'SGP', '702', AddressContinent_1.AddressContinent.AS, '000', '+65', undefined, 'SGD', ['zh-SG', 'en-SG']);
+AddressRegion.SG = new AddressRegion('SG', 'SGP', '702', AddressContinent_1.AddressContinent.AS, '000', '+65', undefined, 'SGD', ['zh-Hans-SG', 'zh-SG', 'en-SG']);
 /**
  * JP - Japan
  * 日本

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

@@ -0,0 +1,33 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { IActionResult } from '../result/IActionResult';
+import { IUser } from '../state/User';
+import { BaseApi } from './BaseApi';
+import { ResultPayload } from './dto/ResultPayload';
+import { LoginRQ } from './rq/LoginRQ';
+import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+/**
+ * Authentication API
+ */
+export declare class AuthApi extends BaseApi {
+    /**
+     * Login
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
+    /**
+     * Login id check
+     * @param id Check id
+     * @param payload Payload
+     * @returns Result
+     */
+    loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Reset password
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+}

package/lib/cjs/erp/AuthApi.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthApi = void 0;
+const BaseApi_1 = require("./BaseApi");
+/**
+ * Authentication API
+ */
+class AuthApi extends BaseApi_1.BaseApi {
+    /**
+     * Login
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    async loginBase(rq, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = {});
+        const result = await this.api.post('Auth/Login', rq, payload);
+        const refreshToken = (result === null || result === void 0 ? void 0 : result.ok)
+            ? this.app.getResponseToken(payload.response)
+            : null;
+        return [result, refreshToken];
+    }
+    /**
+     * Login id check
+     * @param id Check id
+     * @param payload Payload
+     * @returns Result
+     */
+    loginId(id, payload) {
+        const { deviceId, region } = this.app;
+        id = this.app.encrypt(id);
+        const rq = {
+            id,
+            deviceId,
+            region
+        };
+        return this.api.get('Auth/LoginId', rq, payload);
+    }
+    /**
+     * Reset password
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    resetPassword(rq, payload) {
+        return this.api.put('Auth/ResetPassword', rq, payload);
+    }
+}
+exports.AuthApi = AuthApi;

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

@@ -0,0 +1,17 @@
+/**
+ * Login id request data
+ */
+export type LoginIdRQ = {
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * Username, Email or mobile
+     */
+    id: string;
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/lib/cjs/erp/rq/LoginIdRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,23 @@
+import { DataTypes } from '@etsoo/shared';
+import { LoginIdRQ } from './LoginIdRQ';
+/**
+ * Login request data
+ */
+export type LoginRQ = LoginIdRQ & {
+    /**
+     * Password
+     */
+    pwd: string;
+    /**
+     * Organization
+     */
+    org?: number;
+    /**
+     * Time zone
+     */
+    timezone?: string;
+    /**
+     * Service id or uid
+     */
+    serviceId?: DataTypes.IdType;
+};

package/lib/cjs/erp/rq/LoginRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,22 @@
+export type ResetPasswordRQ = {
+    /**
+     * Email or mobile
+     */
+    id: string;
+    /**
+     * Verification code id
+     */
+    codeId: string;
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * New password
+     */
+    password: string;
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/lib/cjs/erp/rq/ResetPasswordRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/index.d.ts

@@ -28,14 +28,18 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/LoginIdRQ';
+export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
+export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
+export * from './erp/AuthApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
 export * from './erp/MemberApi';

package/lib/cjs/index.js

@@ -52,15 +52,19 @@ __exportStar(require("./erp/dto/OrgViewDto"), exports);
 __exportStar(require("./erp/dto/PublicProductDto"), exports);
 __exportStar(require("./erp/dto/ResultPayload"), exports);
 // erp rq
+__exportStar(require("./erp/rq/LoginIdRQ"), exports);
+__exportStar(require("./erp/rq/LoginRQ"), exports);
 __exportStar(require("./erp/rq/MemberListRQ"), exports);
 __exportStar(require("./erp/rq/OrgListRQ"), exports);
 __exportStar(require("./erp/rq/OrgQueryRQ"), exports);
 __exportStar(require("./erp/rq/QueryRQ"), exports);
 __exportStar(require("./erp/rq/RefreshTokenRQ"), exports);
 __exportStar(require("./erp/rq/RegionsRQ"), exports);
+__exportStar(require("./erp/rq/ResetPasswordRQ"), exports);
 __exportStar(require("./erp/rq/TiplistRQ"), exports);
 // erp api
 __exportStar(require("./erp/AddressApi"), exports);
+__exportStar(require("./erp/AuthApi"), exports);
 __exportStar(require("./erp/BaseApi"), exports);
 __exportStar(require("./erp/EntityApi"), exports);
 __exportStar(require("./erp/MemberApi"), exports);

package/lib/mjs/address/AddressRegion.js

@@ -28,17 +28,17 @@ export class AddressRegion {
 /**
  * CN - China
  */
-AddressRegion.CN = new AddressRegion('CN', 'CHN', '156', AddressContinent.AS, '00', '+86', '0', 'CNY', ['zh-CN']);
+AddressRegion.CN = new AddressRegion('CN', 'CHN', '156', AddressContinent.AS, '00', '+86', '0', 'CNY', ['zh-Hans-CN', 'zh-CN']);
 /**
  * HK - HK, China
  * 中国香港
  */
-AddressRegion.HK = new AddressRegion('HK', 'HKG', '344', AddressContinent.AS, '001', '+852', undefined, 'HKD', ['zh-HK', 'en-HK']);
+AddressRegion.HK = new AddressRegion('HK', 'HKG', '344', AddressContinent.AS, '001', '+852', undefined, 'HKD', ['zh-Hant-HK', 'zh-HK', 'en-HK']);
 /**
  * SG - Singapore
  * 新加坡
  */
-AddressRegion.SG = new AddressRegion('SG', 'SGP', '702', AddressContinent.AS, '000', '+65', undefined, 'SGD', ['zh-SG', 'en-SG']);
+AddressRegion.SG = new AddressRegion('SG', 'SGP', '702', AddressContinent.AS, '000', '+65', undefined, 'SGD', ['zh-Hans-SG', 'zh-SG', 'en-SG']);
 /**
  * JP - Japan
  * 日本

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

@@ -0,0 +1,33 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { IActionResult } from '../result/IActionResult';
+import { IUser } from '../state/User';
+import { BaseApi } from './BaseApi';
+import { ResultPayload } from './dto/ResultPayload';
+import { LoginRQ } from './rq/LoginRQ';
+import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+/**
+ * Authentication API
+ */
+export declare class AuthApi extends BaseApi {
+    /**
+     * Login
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
+    /**
+     * Login id check
+     * @param id Check id
+     * @param payload Payload
+     * @returns Result
+     */
+    loginId(id: string, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Reset password
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+}

package/lib/mjs/erp/AuthApi.js

@@ -0,0 +1,45 @@
+import { BaseApi } from './BaseApi';
+/**
+ * Authentication API
+ */
+export class AuthApi extends BaseApi {
+    /**
+     * Login
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    async loginBase(rq, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = {});
+        const result = await this.api.post('Auth/Login', rq, payload);
+        const refreshToken = (result === null || result === void 0 ? void 0 : result.ok)
+            ? this.app.getResponseToken(payload.response)
+            : null;
+        return [result, refreshToken];
+    }
+    /**
+     * Login id check
+     * @param id Check id
+     * @param payload Payload
+     * @returns Result
+     */
+    loginId(id, payload) {
+        const { deviceId, region } = this.app;
+        id = this.app.encrypt(id);
+        const rq = {
+            id,
+            deviceId,
+            region
+        };
+        return this.api.get('Auth/LoginId', rq, payload);
+    }
+    /**
+     * Reset password
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    resetPassword(rq, payload) {
+        return this.api.put('Auth/ResetPassword', rq, payload);
+    }
+}

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

@@ -0,0 +1,17 @@
+/**
+ * Login id request data
+ */
+export type LoginIdRQ = {
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * Username, Email or mobile
+     */
+    id: string;
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/lib/mjs/erp/rq/LoginIdRQ.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,23 @@
+import { DataTypes } from '@etsoo/shared';
+import { LoginIdRQ } from './LoginIdRQ';
+/**
+ * Login request data
+ */
+export type LoginRQ = LoginIdRQ & {
+    /**
+     * Password
+     */
+    pwd: string;
+    /**
+     * Organization
+     */
+    org?: number;
+    /**
+     * Time zone
+     */
+    timezone?: string;
+    /**
+     * Service id or uid
+     */
+    serviceId?: DataTypes.IdType;
+};

package/lib/mjs/erp/rq/LoginRQ.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,22 @@
+export type ResetPasswordRQ = {
+    /**
+     * Email or mobile
+     */
+    id: string;
+    /**
+     * Verification code id
+     */
+    codeId: string;
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * New password
+     */
+    password: string;
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/lib/mjs/erp/rq/ResetPasswordRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/index.d.ts

@@ -28,14 +28,18 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/LoginIdRQ';
+export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
+export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
+export * from './erp/AuthApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
 export * from './erp/MemberApi';

package/lib/mjs/index.js

@@ -35,15 +35,19 @@ export * from './erp/dto/OrgViewDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
 // erp rq
+export * from './erp/rq/LoginIdRQ';
+export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
+export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/TiplistRQ';
 // erp api
 export * from './erp/AddressApi';
+export * from './erp/AuthApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
 export * from './erp/MemberApi';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.47",
+    "version": "1.3.48",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -64,9 +64,9 @@
         "@babel/plugin-transform-runtime": "^7.19.6",
         "@babel/preset-env": "^7.20.2",
         "@babel/runtime-corejs3": "^7.20.6",
-        "@types/jest": "^29.2.3",
-        "@typescript-eslint/eslint-plugin": "^5.45.0",
-        "@typescript-eslint/parser": "^5.45.0",
+        "@types/jest": "^29.2.4",
+        "@typescript-eslint/eslint-plugin": "^5.45.1",
+        "@typescript-eslint/parser": "^5.45.1",
         "eslint": "^8.29.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/address/AddressRegion.ts

@@ -100,7 +100,7 @@ export class AddressRegion implements IAddressRegion {
         '+86',
         '0',
         'CNY',
-        ['zh-CN']
+        ['zh-Hans-CN', 'zh-CN']
     );
 
     /**
@@ -116,7 +116,7 @@ export class AddressRegion implements IAddressRegion {
         '+852',
         undefined,
         'HKD',
-        ['zh-HK', 'en-HK']
+        ['zh-Hant-HK', 'zh-HK', 'en-HK']
     );
 
     /**
@@ -132,7 +132,7 @@ export class AddressRegion implements IAddressRegion {
         '+65',
         undefined,
         'SGD',
-        ['zh-SG', 'en-SG']
+        ['zh-Hans-SG', 'zh-SG', 'en-SG']
     );
 
     /**

package/src/erp/AuthApi.ts

@@ -0,0 +1,58 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { IActionResult } from '../result/IActionResult';
+import { IUser } from '../state/User';
+import { BaseApi } from './BaseApi';
+import { ResultPayload } from './dto/ResultPayload';
+import { LoginIdRQ } from './rq/LoginIdRQ';
+import { LoginRQ } from './rq/LoginRQ';
+import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+
+/**
+ * Authentication API
+ */
+export class AuthApi extends BaseApi {
+    /**
+     * Login
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected async loginBase<T extends IUser>(
+        rq: LoginRQ,
+        payload?: IApiPayload<IActionResult<T>>
+    ): Promise<[IActionResult<T> | undefined, string | null]> {
+        payload ??= {};
+        const result = await this.api.post('Auth/Login', rq, payload);
+        const refreshToken = result?.ok
+            ? this.app.getResponseToken(payload.response)
+            : null;
+        return [result, refreshToken];
+    }
+
+    /**
+     * Login id check
+     * @param id Check id
+     * @param payload Payload
+     * @returns Result
+     */
+    loginId(id: string, payload?: ResultPayload) {
+        const { deviceId, region } = this.app;
+        id = this.app.encrypt(id);
+        const rq: LoginIdRQ = {
+            id,
+            deviceId,
+            region
+        };
+        return this.api.get('Auth/LoginId', rq, payload);
+    }
+
+    /**
+     * Reset password
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    resetPassword(rq: ResetPasswordRQ, payload?: ResultPayload) {
+        return this.api.put('Auth/ResetPassword', rq, payload);
+    }
+}

package/src/erp/rq/LoginIdRQ.ts

@@ -0,0 +1,19 @@
+/**
+ * Login id request data
+ */
+export type LoginIdRQ = {
+    /**
+     * Device id
+     */
+    deviceId: string;
+
+    /**
+     * Username, Email or mobile
+     */
+    id: string;
+
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/src/erp/rq/LoginRQ.ts

@@ -0,0 +1,27 @@
+import { DataTypes } from '@etsoo/shared';
+import { LoginIdRQ } from './LoginIdRQ';
+
+/**
+ * Login request data
+ */
+export type LoginRQ = LoginIdRQ & {
+    /**
+     * Password
+     */
+    pwd: string;
+
+    /**
+     * Organization
+     */
+    org?: number;
+
+    /**
+     * Time zone
+     */
+    timezone?: string;
+
+    /**
+     * Service id or uid
+     */
+    serviceId?: DataTypes.IdType;
+};

package/src/erp/rq/ResetPasswordRQ.ts

@@ -0,0 +1,26 @@
+export type ResetPasswordRQ = {
+    /**
+     * Email or mobile
+     */
+    id: string;
+
+    /**
+     * Verification code id
+     */
+    codeId: string;
+
+    /**
+     * Device id
+     */
+    deviceId: string;
+
+    /**
+     * New password
+     */
+    password: string;
+
+    /**
+     * Country or region
+     */
+    region: string;
+};

package/src/index.ts

@@ -41,16 +41,20 @@ export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
 
 // erp rq
+export * from './erp/rq/LoginIdRQ';
+export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';
+export * from './erp/rq/ResetPasswordRQ';
 export * from './erp/rq/TiplistRQ';
 
 // erp api
 export * from './erp/AddressApi';
+export * from './erp/AuthApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
 export * from './erp/MemberApi';