@etsoo/appscript 1.5.8 → 1.5.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -474,9 +474,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
474
474
  /**
475
475
  * Get refresh token from response headers
476
476
  * @param rawResponse Raw response from API call
477
+ * @param tokenKey Refresh token key
477
478
  * @returns response refresh token
478
479
  */
479
- getResponseToken(rawResponse: any): string | null;
480
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null;
480
481
  /**
481
482
  * Get time zone
482
483
  * @returns Time zone
@@ -1167,11 +1167,12 @@ class CoreApp {
1167
1167
  /**
1168
1168
  * Get refresh token from response headers
1169
1169
  * @param rawResponse Raw response from API call
1170
+ * @param tokenKey Refresh token key
1170
1171
  * @returns response refresh token
1171
1172
  */
1172
- getResponseToken(rawResponse) {
1173
+ getResponseToken(rawResponse, tokenKey) {
1173
1174
  const response = this.api.transformResponse(rawResponse);
1174
- return this.api.getHeaderValue(response.headers, 'SmartERPRefreshToken');
1175
+ return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
1175
1176
  }
1176
1177
  /**
1177
1178
  * Get time zone
@@ -401,9 +401,10 @@ export interface IApp {
401
401
  /**
402
402
  * Get refresh token from response headers
403
403
  * @param rawResponse Raw response from API call
404
+ * @param tokenKey Refresh token key
404
405
  * @returns response refresh token
405
406
  */
406
- getResponseToken(rawResponse: any): string | null;
407
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null;
407
408
  /**
408
409
  * Get time zone
409
410
  * @returns Time zone
@@ -6,6 +6,7 @@
6
6
  export declare enum DataPrivacy {
7
7
  Public = 0,
8
8
  Customer = 20,
9
+ Channel = 30,
9
10
  Internal = 40,
10
11
  Dept = 60,
11
12
  Admin = 80,
@@ -19,6 +19,11 @@ var DataPrivacy;
19
19
  /// </summary>
20
20
  DataPrivacy[DataPrivacy["Customer"] = 20] = "Customer";
21
21
  /// <summary>
22
+ /// Channel disclosure
23
+ /// 渠道可见
24
+ /// </summary>
25
+ DataPrivacy[DataPrivacy["Channel"] = 30] = "Channel";
26
+ /// <summary>
22
27
  /// Internal
23
28
  /// 内部可见
24
29
  /// </summary>
@@ -13,9 +13,10 @@ export declare class AuthApi extends BaseApi {
13
13
  * Login
14
14
  * @param rq Request data
15
15
  * @param payload Payload
16
+ * @param tokenKey Refresh token key
16
17
  * @returns Result
17
18
  */
18
- protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
19
+ protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
19
20
  /**
20
21
  * Login id check
21
22
  * @param id Check id
@@ -10,13 +10,14 @@ class AuthApi extends BaseApi_1.BaseApi {
10
10
  * Login
11
11
  * @param rq Request data
12
12
  * @param payload Payload
13
+ * @param tokenKey Refresh token key
13
14
  * @returns Result
14
15
  */
15
- async loginBase(rq, payload) {
16
+ async loginBase(rq, payload, tokenKey) {
16
17
  payload ?? (payload = {});
17
18
  const result = await this.api.post('Auth/Login', rq, payload);
18
19
  const refreshToken = result?.ok
19
- ? this.app.getResponseToken(payload.response)
20
+ ? this.app.getResponseToken(payload.response, tokenKey)
20
21
  : null;
21
22
  return [result, refreshToken];
22
23
  }
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "Data comparison",
50
50
  "dataPrivacy": "Data privacy",
51
51
  "dataPrivacyAdmin": "Admins",
52
+ "dataPrivacyChannel": "Channels",
52
53
  "dataPrivacyCustomer": "Customers",
53
54
  "dataPrivacyDept": "Dept users",
54
55
  "dataPrivacyInternal": "All users",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "数据对比",
50
50
  "dataPrivacy": "数据隐私",
51
51
  "dataPrivacyAdmin": "管理员可见",
52
+ "dataPrivacyChannel": "渠道可见",
52
53
  "dataPrivacyCustomer": "客户可见",
53
54
  "dataPrivacyDept": "部门可见",
54
55
  "dataPrivacyInternal": "所有用户",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "數據對比",
50
50
  "dataPrivacy": "數據隱私",
51
51
  "dataPrivacyAdmin": "管理員可見",
52
+ "dataPrivacyChannel": "渠道可見",
52
53
  "dataPrivacyCustomer": "客戶可見",
53
54
  "dataPrivacyDept": "部門可見",
54
55
  "dataPrivacyInternal": "所有用户",
@@ -474,9 +474,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
474
474
  /**
475
475
  * Get refresh token from response headers
476
476
  * @param rawResponse Raw response from API call
477
+ * @param tokenKey Refresh token key
477
478
  * @returns response refresh token
478
479
  */
479
- getResponseToken(rawResponse: any): string | null;
480
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null;
480
481
  /**
481
482
  * Get time zone
482
483
  * @returns Time zone
@@ -1164,11 +1164,12 @@ export class CoreApp {
1164
1164
  /**
1165
1165
  * Get refresh token from response headers
1166
1166
  * @param rawResponse Raw response from API call
1167
+ * @param tokenKey Refresh token key
1167
1168
  * @returns response refresh token
1168
1169
  */
1169
- getResponseToken(rawResponse) {
1170
+ getResponseToken(rawResponse, tokenKey) {
1170
1171
  const response = this.api.transformResponse(rawResponse);
1171
- return this.api.getHeaderValue(response.headers, 'SmartERPRefreshToken');
1172
+ return this.api.getHeaderValue(response.headers, tokenKey ?? 'Smarterp-Refresh-Token');
1172
1173
  }
1173
1174
  /**
1174
1175
  * Get time zone
@@ -401,9 +401,10 @@ export interface IApp {
401
401
  /**
402
402
  * Get refresh token from response headers
403
403
  * @param rawResponse Raw response from API call
404
+ * @param tokenKey Refresh token key
404
405
  * @returns response refresh token
405
406
  */
406
- getResponseToken(rawResponse: any): string | null;
407
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null;
407
408
  /**
408
409
  * Get time zone
409
410
  * @returns Time zone
@@ -6,6 +6,7 @@
6
6
  export declare enum DataPrivacy {
7
7
  Public = 0,
8
8
  Customer = 20,
9
+ Channel = 30,
9
10
  Internal = 40,
10
11
  Dept = 60,
11
12
  Admin = 80,
@@ -16,6 +16,11 @@ export var DataPrivacy;
16
16
  /// </summary>
17
17
  DataPrivacy[DataPrivacy["Customer"] = 20] = "Customer";
18
18
  /// <summary>
19
+ /// Channel disclosure
20
+ /// 渠道可见
21
+ /// </summary>
22
+ DataPrivacy[DataPrivacy["Channel"] = 30] = "Channel";
23
+ /// <summary>
19
24
  /// Internal
20
25
  /// 内部可见
21
26
  /// </summary>
@@ -13,9 +13,10 @@ export declare class AuthApi extends BaseApi {
13
13
  * Login
14
14
  * @param rq Request data
15
15
  * @param payload Payload
16
+ * @param tokenKey Refresh token key
16
17
  * @returns Result
17
18
  */
18
- protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>): Promise<[IActionResult<T> | undefined, string | null]>;
19
+ protected loginBase<T extends IUser>(rq: LoginRQ, payload?: IApiPayload<IActionResult<T>>, tokenKey?: string): Promise<[IActionResult<T> | undefined, string | null]>;
19
20
  /**
20
21
  * Login id check
21
22
  * @param id Check id
@@ -7,13 +7,14 @@ export class AuthApi extends BaseApi {
7
7
  * Login
8
8
  * @param rq Request data
9
9
  * @param payload Payload
10
+ * @param tokenKey Refresh token key
10
11
  * @returns Result
11
12
  */
12
- async loginBase(rq, payload) {
13
+ async loginBase(rq, payload, tokenKey) {
13
14
  payload ?? (payload = {});
14
15
  const result = await this.api.post('Auth/Login', rq, payload);
15
16
  const refreshToken = result?.ok
16
- ? this.app.getResponseToken(payload.response)
17
+ ? this.app.getResponseToken(payload.response, tokenKey)
17
18
  : null;
18
19
  return [result, refreshToken];
19
20
  }
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "Data comparison",
50
50
  "dataPrivacy": "Data privacy",
51
51
  "dataPrivacyAdmin": "Admins",
52
+ "dataPrivacyChannel": "Channels",
52
53
  "dataPrivacyCustomer": "Customers",
53
54
  "dataPrivacyDept": "Dept users",
54
55
  "dataPrivacyInternal": "All users",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "数据对比",
50
50
  "dataPrivacy": "数据隐私",
51
51
  "dataPrivacyAdmin": "管理员可见",
52
+ "dataPrivacyChannel": "渠道可见",
52
53
  "dataPrivacyCustomer": "客户可见",
53
54
  "dataPrivacyDept": "部门可见",
54
55
  "dataPrivacyInternal": "所有用户",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "數據對比",
50
50
  "dataPrivacy": "數據隱私",
51
51
  "dataPrivacyAdmin": "管理員可見",
52
+ "dataPrivacyChannel": "渠道可見",
52
53
  "dataPrivacyCustomer": "客戶可見",
53
54
  "dataPrivacyDept": "部門可見",
54
55
  "dataPrivacyInternal": "所有用户",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.5.8",
3
+ "version": "1.5.9",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -1633,13 +1633,14 @@ export abstract class CoreApp<
1633
1633
  /**
1634
1634
  * Get refresh token from response headers
1635
1635
  * @param rawResponse Raw response from API call
1636
+ * @param tokenKey Refresh token key
1636
1637
  * @returns response refresh token
1637
1638
  */
1638
- getResponseToken(rawResponse: any): string | null {
1639
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null {
1639
1640
  const response = this.api.transformResponse(rawResponse);
1640
1641
  return this.api.getHeaderValue(
1641
1642
  response.headers,
1642
- 'SmartERPRefreshToken'
1643
+ tokenKey ?? 'Smarterp-Refresh-Token'
1643
1644
  );
1644
1645
  }
1645
1646
 
package/src/app/IApp.ts CHANGED
@@ -551,9 +551,10 @@ export interface IApp {
551
551
  /**
552
552
  * Get refresh token from response headers
553
553
  * @param rawResponse Raw response from API call
554
+ * @param tokenKey Refresh token key
554
555
  * @returns response refresh token
555
556
  */
556
- getResponseToken(rawResponse: any): string | null;
557
+ getResponseToken(rawResponse: any, tokenKey?: string): string | null;
557
558
 
558
559
  /**
559
560
  * Get time zone
@@ -16,6 +16,12 @@ export enum DataPrivacy {
16
16
  /// </summary>
17
17
  Customer = 20,
18
18
 
19
+ /// <summary>
20
+ /// Channel disclosure
21
+ /// 渠道可见
22
+ /// </summary>
23
+ Channel = 30,
24
+
19
25
  /// <summary>
20
26
  /// Internal
21
27
  /// 内部可见
@@ -15,16 +15,18 @@ export class AuthApi extends BaseApi {
15
15
  * Login
16
16
  * @param rq Request data
17
17
  * @param payload Payload
18
+ * @param tokenKey Refresh token key
18
19
  * @returns Result
19
20
  */
20
21
  protected async loginBase<T extends IUser>(
21
22
  rq: LoginRQ,
22
- payload?: IApiPayload<IActionResult<T>>
23
+ payload?: IApiPayload<IActionResult<T>>,
24
+ tokenKey?: string
23
25
  ): Promise<[IActionResult<T> | undefined, string | null]> {
24
26
  payload ??= {};
25
27
  const result = await this.api.post('Auth/Login', rq, payload);
26
28
  const refreshToken = result?.ok
27
- ? this.app.getResponseToken(payload.response)
29
+ ? this.app.getResponseToken(payload.response, tokenKey)
28
30
  : null;
29
31
  return [result, refreshToken];
30
32
  }
package/src/i18n/en.json CHANGED
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "Data comparison",
50
50
  "dataPrivacy": "Data privacy",
51
51
  "dataPrivacyAdmin": "Admins",
52
+ "dataPrivacyChannel": "Channels",
52
53
  "dataPrivacyCustomer": "Customers",
53
54
  "dataPrivacyDept": "Dept users",
54
55
  "dataPrivacyInternal": "All users",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "数据对比",
50
50
  "dataPrivacy": "数据隐私",
51
51
  "dataPrivacyAdmin": "管理员可见",
52
+ "dataPrivacyChannel": "渠道可见",
52
53
  "dataPrivacyCustomer": "客户可见",
53
54
  "dataPrivacyDept": "部门可见",
54
55
  "dataPrivacyInternal": "所有用户",
@@ -49,6 +49,7 @@
49
49
  "dataComparison": "數據對比",
50
50
  "dataPrivacy": "數據隱私",
51
51
  "dataPrivacyAdmin": "管理員可見",
52
+ "dataPrivacyChannel": "渠道可見",
52
53
  "dataPrivacyCustomer": "客戶可見",
53
54
  "dataPrivacyDept": "部門可見",
54
55
  "dataPrivacyInternal": "所有用户",