@etsoo/appscript 1.5.7 → 1.5.9

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

@@ -474,9 +474,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null;
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
     /**
      * Get time zone
      * @returns Time zone

package/lib/cjs/app/CoreApp.js

@@ -1167,11 +1167,12 @@ class CoreApp {
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse) {
+    getResponseToken(rawResponse, tokenKey) {
         const response = this.api.transformResponse(rawResponse);
-        return this.api.getHeaderValue(response.headers, 'SmartERPRefreshToken');
+        return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
     }
     /**
      * Get time zone

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

@@ -401,9 +401,10 @@ export interface IApp {
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null;
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
     /**
      * Get time zone
      * @returns Time zone

package/lib/cjs/business/DataPrivacy.d.ts

@@ -6,6 +6,7 @@
 export declare enum DataPrivacy {
     Public = 0,
     Customer = 20,
+    Channel = 30,
     Internal = 40,
     Dept = 60,
     Admin = 80,

package/lib/cjs/business/DataPrivacy.js

@@ -19,6 +19,11 @@ var DataPrivacy;
     /// </summary>
     DataPrivacy[DataPrivacy["Customer"] = 20] = "Customer";
     /// <summary>
+    /// Channel disclosure
+    /// 渠道可见
+    /// </summary>
+    DataPrivacy[DataPrivacy["Channel"] = 30] = "Channel";
+    /// <summary>
     /// Internal
     /// 内部可见
     /// </summary>

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

@@ -13,9 +13,10 @@ export declare class AuthApi extends BaseApi {
      * Login
      * @param rq Request data
      * @param payload Payload
+     * @param tokenKey Refresh token key
      * @returns Result
      */
-    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
+    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
     /**
      * Login id check
      * @param id Check id

package/lib/cjs/erp/AuthApi.js

@@ -10,13 +10,14 @@ class AuthApi extends BaseApi_1.BaseApi {
      * Login
      * @param rq Request data
      * @param payload Payload
+     * @param tokenKey Refresh token key
      * @returns Result
      */
-    async loginBase(rq, payload) {
+    async loginBase(rq, payload, tokenKey) {
         payload ?? (payload = {});
         const result = await this.api.post('Auth/Login', rq, payload);
         const refreshToken = result?.ok
-            ? this.app.getResponseToken(payload.response)
+            ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
         return [result, refreshToken];
     }
@@ -34,7 +35,7 @@ class AuthApi extends BaseApi_1.BaseApi {
             deviceId,
             region
         };
-        return this.api.get('Auth/LoginId', rq, payload);
+        return this.api.post('Auth/LoginId', rq, payload);
     }
     /**
      * Reset password

package/lib/cjs/i18n/en.json

@@ -49,6 +49,7 @@
     "dataComparison": "Data comparison",
     "dataPrivacy": "Data privacy",
     "dataPrivacyAdmin": "Admins",
+    "dataPrivacyChannel": "Channels",
     "dataPrivacyCustomer": "Customers",
     "dataPrivacyDept": "Dept users",
     "dataPrivacyInternal": "All users",

package/lib/cjs/i18n/zh-Hans.json

@@ -49,6 +49,7 @@
     "dataComparison": "数据对比",
     "dataPrivacy": "数据隐私",
     "dataPrivacyAdmin": "管理员可见",
+    "dataPrivacyChannel": "渠道可见",
     "dataPrivacyCustomer": "客户可见",
     "dataPrivacyDept": "部门可见",
     "dataPrivacyInternal": "所有用户",

package/lib/cjs/i18n/zh-Hant.json

@@ -49,6 +49,7 @@
     "dataComparison": "數據對比",
     "dataPrivacy": "數據隱私",
     "dataPrivacyAdmin": "管理員可見",
+    "dataPrivacyChannel": "渠道可見",
     "dataPrivacyCustomer": "客戶可見",
     "dataPrivacyDept": "部門可見",
     "dataPrivacyInternal": "所有用户",

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

@@ -474,9 +474,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null;
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
     /**
      * Get time zone
      * @returns Time zone

package/lib/mjs/app/CoreApp.js

@@ -1164,11 +1164,12 @@ export class CoreApp {
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse) {
+    getResponseToken(rawResponse, tokenKey) {
         const response = this.api.transformResponse(rawResponse);
-        return this.api.getHeaderValue(response.headers, 'SmartERPRefreshToken');
+        return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
     }
     /**
      * Get time zone

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

@@ -401,9 +401,10 @@ export interface IApp {
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null;
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
     /**
      * Get time zone
      * @returns Time zone

package/lib/mjs/business/DataPrivacy.d.ts

@@ -6,6 +6,7 @@
 export declare enum DataPrivacy {
     Public = 0,
     Customer = 20,
+    Channel = 30,
     Internal = 40,
     Dept = 60,
     Admin = 80,

package/lib/mjs/business/DataPrivacy.js

@@ -16,6 +16,11 @@ export var DataPrivacy;
     /// </summary>
     DataPrivacy[DataPrivacy["Customer"] = 20] = "Customer";
     /// <summary>
+    /// Channel disclosure
+    /// 渠道可见
+    /// </summary>
+    DataPrivacy[DataPrivacy["Channel"] = 30] = "Channel";
+    /// <summary>
     /// Internal
     /// 内部可见
     /// </summary>

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

@@ -13,9 +13,10 @@ export declare class AuthApi extends BaseApi {
      * Login
      * @param rq Request data
      * @param payload Payload
+     * @param tokenKey Refresh token key
      * @returns Result
      */
-    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
+    protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
     /**
      * Login id check
      * @param id Check id

package/lib/mjs/erp/AuthApi.js

@@ -7,13 +7,14 @@ export class AuthApi extends BaseApi {
      * Login
      * @param rq Request data
      * @param payload Payload
+     * @param tokenKey Refresh token key
      * @returns Result
      */
-    async loginBase(rq, payload) {
+    async loginBase(rq, payload, tokenKey) {
         payload ?? (payload = {});
         const result = await this.api.post('Auth/Login', rq, payload);
         const refreshToken = result?.ok
-            ? this.app.getResponseToken(payload.response)
+            ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
         return [result, refreshToken];
     }
@@ -31,7 +32,7 @@ export class AuthApi extends BaseApi {
             deviceId,
             region
         };
-        return this.api.get('Auth/LoginId', rq, payload);
+        return this.api.post('Auth/LoginId', rq, payload);
     }
     /**
      * Reset password

package/lib/mjs/i18n/en.json

@@ -49,6 +49,7 @@
     "dataComparison": "Data comparison",
     "dataPrivacy": "Data privacy",
     "dataPrivacyAdmin": "Admins",
+    "dataPrivacyChannel": "Channels",
     "dataPrivacyCustomer": "Customers",
     "dataPrivacyDept": "Dept users",
     "dataPrivacyInternal": "All users",

package/lib/mjs/i18n/zh-Hans.json

@@ -49,6 +49,7 @@
     "dataComparison": "数据对比",
     "dataPrivacy": "数据隐私",
     "dataPrivacyAdmin": "管理员可见",
+    "dataPrivacyChannel": "渠道可见",
     "dataPrivacyCustomer": "客户可见",
     "dataPrivacyDept": "部门可见",
     "dataPrivacyInternal": "所有用户",

package/lib/mjs/i18n/zh-Hant.json

@@ -49,6 +49,7 @@
     "dataComparison": "數據對比",
     "dataPrivacy": "數據隱私",
     "dataPrivacyAdmin": "管理員可見",
+    "dataPrivacyChannel": "渠道可見",
     "dataPrivacyCustomer": "客戶可見",
     "dataPrivacyDept": "部門可見",
     "dataPrivacyInternal": "所有用户",

package/package.json

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

package/src/app/CoreApp.ts

@@ -1633,13 +1633,14 @@ export abstract class CoreApp<
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null {
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null {
         const response = this.api.transformResponse(rawResponse);
         return this.api.getHeaderValue(
             response.headers,
-            'SmartERPRefreshToken'
+            tokenKey ?? 'Smarterp-Refresh-Token'
         );
     }
 

package/src/app/IApp.ts

@@ -551,9 +551,10 @@ export interface IApp {
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
+     * @param tokenKey Refresh token key
      * @returns response refresh token
      */
-    getResponseToken(rawResponse: any): string | null;
+    getResponseToken(rawResponse: any, tokenKey?: string): string | null;
 
     /**
      * Get time zone

package/src/business/DataPrivacy.ts

@@ -16,6 +16,12 @@ export enum DataPrivacy {
     /// </summary>
     Customer = 20,
 
+    /// <summary>
+    /// Channel disclosure
+    /// 渠道可见
+    /// </summary>
+    Channel = 30,
+
     /// <summary>
     /// Internal
     /// 内部可见

package/src/erp/AuthApi.ts

@@ -15,16 +15,18 @@ export class AuthApi extends BaseApi {
      * Login
      * @param rq Request data
      * @param payload Payload
+     * @param tokenKey Refresh token key
      * @returns Result
      */
     protected async loginBase<T extends IUser>(
         rq: LoginRQ,
-        payload?: IApiPayload<IActionResult<T>>
+        payload?: IApiPayload<IActionResult<T>>,
+        tokenKey?: string
     ): 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)
+            ? this.app.getResponseToken(payload.response, tokenKey)
             : null;
         return [result, refreshToken];
     }
@@ -43,7 +45,7 @@ export class AuthApi extends BaseApi {
             deviceId,
             region
         };
-        return this.api.get('Auth/LoginId', rq, payload);
+        return this.api.post('Auth/LoginId', rq, payload);
     }
 
     /**

package/src/i18n/en.json

@@ -49,6 +49,7 @@
     "dataComparison": "Data comparison",
     "dataPrivacy": "Data privacy",
     "dataPrivacyAdmin": "Admins",
+    "dataPrivacyChannel": "Channels",
     "dataPrivacyCustomer": "Customers",
     "dataPrivacyDept": "Dept users",
     "dataPrivacyInternal": "All users",

package/src/i18n/zh-Hans.json

@@ -49,6 +49,7 @@
     "dataComparison": "数据对比",
     "dataPrivacy": "数据隐私",
     "dataPrivacyAdmin": "管理员可见",
+    "dataPrivacyChannel": "渠道可见",
     "dataPrivacyCustomer": "客户可见",
     "dataPrivacyDept": "部门可见",
     "dataPrivacyInternal": "所有用户",

package/src/i18n/zh-Hant.json

@@ -49,6 +49,7 @@
     "dataComparison": "數據對比",
     "dataPrivacy": "數據隱私",
     "dataPrivacyAdmin": "管理員可見",
+    "dataPrivacyChannel": "渠道可見",
     "dataPrivacyCustomer": "客戶可見",
     "dataPrivacyDept": "部門可見",
     "dataPrivacyInternal": "所有用户",