@etsoo/materialui 1.3.4 → 1.3.6
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.
- package/lib/app/IAppApi.d.ts +1 -5
- package/lib/app/ServiceApp.js +1 -6
- package/package.json +2 -2
- package/src/app/IAppApi.ts +1 -6
- package/src/app/ServiceApp.ts +1 -7
package/lib/app/IAppApi.d.ts
CHANGED
|
@@ -15,10 +15,6 @@ export interface IAppApi {
|
|
|
15
15
|
* Service id
|
|
16
16
|
*/
|
|
17
17
|
readonly serviceId: number;
|
|
18
|
-
/**
|
|
19
|
-
* Is once authorized
|
|
20
|
-
*/
|
|
21
|
-
get onceAuthorized(): boolean;
|
|
22
18
|
/**
|
|
23
19
|
* Authorize the API
|
|
24
20
|
* @param user SmartERP user
|
|
@@ -29,5 +25,5 @@ export interface IAppApi {
|
|
|
29
25
|
/**
|
|
30
26
|
* Get refresh token data
|
|
31
27
|
*/
|
|
32
|
-
|
|
28
|
+
getRefreshTokenData(): Partial<RefreshTokenRQ>;
|
|
33
29
|
}
|
package/lib/app/ServiceApp.js
CHANGED
|
@@ -48,7 +48,7 @@ export class ServiceApp extends ReactApp {
|
|
|
48
48
|
apiLogin(appApi, callback) {
|
|
49
49
|
return this.refreshToken({
|
|
50
50
|
callback,
|
|
51
|
-
data: appApi.
|
|
51
|
+
data: appApi.getRefreshTokenData(),
|
|
52
52
|
relogin: false,
|
|
53
53
|
showLoading: false,
|
|
54
54
|
appApi
|
|
@@ -153,11 +153,6 @@ export class ServiceApp extends ReactApp {
|
|
|
153
153
|
}
|
|
154
154
|
// Login
|
|
155
155
|
if (appApi) {
|
|
156
|
-
if (!appApi.onceAuthorized) {
|
|
157
|
-
// API handling
|
|
158
|
-
this.setApiLoading(appApi.api);
|
|
159
|
-
this.setApiErrorHandler(appApi.api, true);
|
|
160
|
-
}
|
|
161
156
|
// Authorize external service application API
|
|
162
157
|
appApi.authorize(userData, refreshToken, serviceResult.data);
|
|
163
158
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etsoo/materialui",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.6",
|
|
4
4
|
"description": "TypeScript Material-UI Implementation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@emotion/css": "^11.11.2",
|
|
51
51
|
"@emotion/react": "^11.11.1",
|
|
52
52
|
"@emotion/styled": "^11.11.0",
|
|
53
|
-
"@etsoo/appscript": "^1.4.
|
|
53
|
+
"@etsoo/appscript": "^1.4.40",
|
|
54
54
|
"@etsoo/notificationbase": "^1.1.28",
|
|
55
55
|
"@etsoo/react": "^1.7.7",
|
|
56
56
|
"@etsoo/shared": "^1.2.10",
|
package/src/app/IAppApi.ts
CHANGED
|
@@ -18,11 +18,6 @@ export interface IAppApi {
|
|
|
18
18
|
*/
|
|
19
19
|
readonly serviceId: number;
|
|
20
20
|
|
|
21
|
-
/**
|
|
22
|
-
* Is once authorized
|
|
23
|
-
*/
|
|
24
|
-
get onceAuthorized(): boolean;
|
|
25
|
-
|
|
26
21
|
/**
|
|
27
22
|
* Authorize the API
|
|
28
23
|
* @param user SmartERP user
|
|
@@ -38,5 +33,5 @@ export interface IAppApi {
|
|
|
38
33
|
/**
|
|
39
34
|
* Get refresh token data
|
|
40
35
|
*/
|
|
41
|
-
|
|
36
|
+
getRefreshTokenData(): Partial<RefreshTokenRQ>;
|
|
42
37
|
}
|
package/src/app/ServiceApp.ts
CHANGED
|
@@ -95,7 +95,7 @@ export class ServiceApp<
|
|
|
95
95
|
) {
|
|
96
96
|
return this.refreshToken({
|
|
97
97
|
callback,
|
|
98
|
-
data: appApi.
|
|
98
|
+
data: appApi.getRefreshTokenData(),
|
|
99
99
|
relogin: false,
|
|
100
100
|
showLoading: false,
|
|
101
101
|
appApi
|
|
@@ -229,12 +229,6 @@ export class ServiceApp<
|
|
|
229
229
|
|
|
230
230
|
// Login
|
|
231
231
|
if (appApi) {
|
|
232
|
-
if (!appApi.onceAuthorized) {
|
|
233
|
-
// API handling
|
|
234
|
-
this.setApiLoading(appApi.api);
|
|
235
|
-
this.setApiErrorHandler(appApi.api, true);
|
|
236
|
-
}
|
|
237
|
-
|
|
238
232
|
// Authorize external service application API
|
|
239
233
|
appApi.authorize(userData, refreshToken, serviceResult.data);
|
|
240
234
|
} else {
|