@etsoo/react 1.3.71 → 1.3.75

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.
Files changed (6) hide show
  1. package/lib/app/RefreshTokenRQ.d.ts +4 -0
  2. package/lib/app/ServiceApp.d.ts +8 -6
  3. package/lib/app/ServiceApp.js +19 -8
  4. package/package.json +8 -8
  5. package/src/app/RefreshTokenRQ.ts +5 -0
  6. package/src/app/ServiceApp.ts +20 -12
package/lib/app/RefreshTokenRQ.d.ts CHANGED
@@ -10,6 +10,10 @@ export declare type RefreshTokenRQ = {
10
10
  * Login password
11
11
  */
12
12
  pwd?: string;
13
+ /**
14
+ * Service device id
15
+ */
16
+ serviceDeviceId?: string;
13
17
  /**
14
18
  * Service id
15
19
  */
package/lib/app/ServiceApp.d.ts CHANGED
@@ -16,14 +16,16 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
16
16
  * Service API
17
17
  */
18
18
  readonly serviceApi: IApi;
19
+ private _serviceUser?;
19
20
  /**
20
- * Core system user
21
+ * Service user
21
22
  */
22
- coreUser?: ISmartERPUser;
23
+ get serviceUser(): IServiceUser | undefined;
24
+ protected set serviceUser(value: IServiceUser | undefined);
23
25
  /**
24
26
  * Service passphrase
25
27
  */
26
- servicePassphrase: string;
28
+ protected servicePassphrase: string;
27
29
  /**
28
30
  * Constructor
29
31
  * @param settings Settings
@@ -61,9 +63,9 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
61
63
  tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
62
64
  /**
63
65
  * User login extended
64
- * @param user New user
66
+ * @param user Core system user
65
67
  * @param refreshToken Refresh token
66
- * @param coreUser Core system user
68
+ * @param serviceUser Service user
67
69
  */
68
- userLoginEx(user: IServiceUser, refreshToken: string, coreUser: ISmartERPUser): void;
70
+ userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
69
71
  }
package/lib/app/ServiceApp.js CHANGED
@@ -30,6 +30,15 @@ export class ServiceApp extends ReactApp {
30
30
  this.setApi(api);
31
31
  this.serviceApi = api;
32
32
  }
33
+ /**
34
+ * Service user
35
+ */
36
+ get serviceUser() {
37
+ return this._serviceUser;
38
+ }
39
+ set serviceUser(value) {
40
+ this._serviceUser = value;
41
+ }
33
42
  /**
34
43
  * Go to the login page
35
44
  */
@@ -39,6 +48,8 @@ export class ServiceApp extends ReactApp {
39
48
  coreUrl +
40
49
  '?serviceId=' +
41
50
  this.settings.serviceId +
51
+ '&serviceDeviceId=' +
52
+ encodeURIComponent(this.deviceId) +
42
53
  '&' +
43
54
  DomUtils.Culture +
44
55
  '=' +
@@ -112,7 +123,7 @@ export class ServiceApp extends ReactApp {
112
123
  return false;
113
124
  }
114
125
  // Login
115
- this.userLoginEx(serviceResult.data, refreshToken, userData);
126
+ this.userLoginEx(userData, refreshToken, serviceResult.data);
116
127
  // Success callback
117
128
  if (failCallback)
118
129
  failCallback(true);
@@ -216,20 +227,20 @@ export class ServiceApp extends ReactApp {
216
227
  }
217
228
  /**
218
229
  * User login extended
219
- * @param user New user
230
+ * @param user Core system user
220
231
  * @param refreshToken Refresh token
221
- * @param coreUser Core system user
232
+ * @param serviceUser Service user
222
233
  */
223
- userLoginEx(user, refreshToken, coreUser) {
234
+ userLoginEx(user, refreshToken, serviceUser) {
224
235
  var _a;
225
236
  // Service user login
226
237
  this.servicePassphrase =
227
- (_a = this.decrypt(user.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
238
+ (_a = this.decrypt(serviceUser.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
228
239
  // Keep = true, means service could hold the refresh token for long access
229
240
  super.userLogin(user, refreshToken, true);
230
- // Core system user
231
- this.coreUser = coreUser;
241
+ // Service user
242
+ this.serviceUser = serviceUser;
232
243
  // Service API token
233
- this.serviceApi.authorize(this.settings.authScheme, coreUser.token);
244
+ this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
234
245
  }
235
246
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/react",
3
- "version": "1.3.71",
3
+ "version": "1.3.75",
4
4
  "description": "TypeScript ReactJs framework",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -50,11 +50,11 @@
50
50
  "@emotion/react": "^11.7.1",
51
51
  "@emotion/style": "^0.8.0",
52
52
  "@emotion/styled": "^11.6.0",
53
- "@etsoo/appscript": "^1.1.85",
54
- "@etsoo/notificationbase": "^1.0.94",
55
- "@etsoo/shared": "^1.0.78",
56
- "@mui/icons-material": "^5.2.4",
57
- "@mui/material": "^5.2.4",
53
+ "@etsoo/appscript": "^1.1.89",
54
+ "@etsoo/notificationbase": "^1.0.95",
55
+ "@etsoo/shared": "^1.0.82",
56
+ "@mui/icons-material": "^5.2.5",
57
+ "@mui/material": "^5.2.5",
58
58
  "@reach/router": "^1.3.4",
59
59
  "@types/pica": "^5.1.3",
60
60
  "@types/pulltorefreshjs": "^0.1.5",
@@ -81,8 +81,8 @@
81
81
  "@babel/runtime-corejs3": "^7.16.5",
82
82
  "@types/jest": "^27.0.3",
83
83
  "@types/react-test-renderer": "^17.0.1",
84
- "@typescript-eslint/eslint-plugin": "^5.7.0",
85
- "@typescript-eslint/parser": "^5.7.0",
84
+ "@typescript-eslint/eslint-plugin": "^5.8.0",
85
+ "@typescript-eslint/parser": "^5.8.0",
86
86
  "eslint": "^8.5.0",
87
87
  "eslint-config-airbnb-base": "^15.0.0",
88
88
  "eslint-plugin-import": "^2.25.3",
package/src/app/RefreshTokenRQ.ts CHANGED
@@ -12,6 +12,11 @@ export type RefreshTokenRQ = {
12
12
  */
13
13
  pwd?: string;
14
14
 
15
+ /**
16
+ * Service device id
17
+ */
18
+ serviceDeviceId?: string;
19
+
15
20
  /**
16
21
  * Service id
17
22
  */
package/src/app/ServiceApp.ts CHANGED
@@ -30,15 +30,21 @@ export class ServiceApp<
30
30
  */
31
31
  readonly serviceApi: IApi;
32
32
 
33
+ private _serviceUser?: IServiceUser;
33
34
  /**
34
- * Core system user
35
+ * Service user
35
36
  */
36
- coreUser?: ISmartERPUser;
37
+ get serviceUser() {
38
+ return this._serviceUser;
39
+ }
40
+ protected set serviceUser(value: IServiceUser | undefined) {
41
+ this._serviceUser = value;
42
+ }
37
43
 
38
44
  /**
39
45
  * Service passphrase
40
46
  */
41
- servicePassphrase: string = '';
47
+ protected servicePassphrase: string = '';
42
48
 
43
49
  /**
44
50
  * Constructor
@@ -70,6 +76,8 @@ export class ServiceApp<
70
76
  coreUrl +
71
77
  '?serviceId=' +
72
78
  this.settings.serviceId +
79
+ '&serviceDeviceId=' +
80
+ encodeURIComponent(this.deviceId) +
73
81
  '&' +
74
82
  DomUtils.Culture +
75
83
  '=' +
@@ -166,7 +174,7 @@ export class ServiceApp<
166
174
  }
167
175
 
168
176
  // Login
169
- this.userLoginEx(serviceResult.data, refreshToken, userData);
177
+ this.userLoginEx(userData, refreshToken, serviceResult.data);
170
178
 
171
179
  // Success callback
172
180
  if (failCallback) failCallback(true);
@@ -309,29 +317,29 @@ export class ServiceApp<
309
317
 
310
318
  /**
311
319
  * User login extended
312
- * @param user New user
320
+ * @param user Core system user
313
321
  * @param refreshToken Refresh token
314
- * @param coreUser Core system user
322
+ * @param serviceUser Service user
315
323
  */
316
324
  userLoginEx(
317
- user: IServiceUser,
325
+ user: ISmartERPUser,
318
326
  refreshToken: string,
319
- coreUser: ISmartERPUser
327
+ serviceUser: IServiceUser
320
328
  ): void {
321
329
  // Service user login
322
330
  this.servicePassphrase =
323
331
  this.decrypt(
324
- user.serviceDeviceId,
332
+ serviceUser.serviceDeviceId,
325
333
  this.settings.serviceId.toString()
326
334
  ) ?? '';
327
335
 
328
336
  // Keep = true, means service could hold the refresh token for long access
329
337
  super.userLogin(user, refreshToken, true);
330
338
 
331
- // Core system user
332
- this.coreUser = coreUser;
339
+ // Service user
340
+ this.serviceUser = serviceUser;
333
341
 
334
342
  // Service API token
335
- this.serviceApi.authorize(this.settings.authScheme, coreUser.token);
343
+ this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
336
344
  }
337
345
  }