@etsoo/materialui 1.4.55 → 1.4.56
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/ServiceApp.js +2 -1
- package/package.json +1 -1
- package/src/app/ServiceApp.ts +3 -1
package/lib/app/ServiceApp.js
CHANGED
|
@@ -134,7 +134,6 @@ export class ServiceApp extends ReactApp {
|
|
|
134
134
|
userLoginEx(user, core, dispatch) {
|
|
135
135
|
// User login
|
|
136
136
|
const { refreshToken } = user;
|
|
137
|
-
this.userLogin(user, refreshToken, dispatch);
|
|
138
137
|
// Core system login
|
|
139
138
|
core ??= {
|
|
140
139
|
refreshToken,
|
|
@@ -144,6 +143,8 @@ export class ServiceApp extends ReactApp {
|
|
|
144
143
|
};
|
|
145
144
|
// Cache the core system data
|
|
146
145
|
this.saveCoreToken(core);
|
|
146
|
+
// User login and trigger the dispatch at last
|
|
147
|
+
this.userLogin(user, refreshToken, dispatch);
|
|
147
148
|
}
|
|
148
149
|
/**
|
|
149
150
|
* Save core system data
|
package/package.json
CHANGED
package/src/app/ServiceApp.ts
CHANGED
|
@@ -176,7 +176,6 @@ export class ServiceApp<
|
|
|
176
176
|
) {
|
|
177
177
|
// User login
|
|
178
178
|
const { refreshToken } = user;
|
|
179
|
-
this.userLogin(user, refreshToken, dispatch);
|
|
180
179
|
|
|
181
180
|
// Core system login
|
|
182
181
|
core ??= {
|
|
@@ -188,6 +187,9 @@ export class ServiceApp<
|
|
|
188
187
|
|
|
189
188
|
// Cache the core system data
|
|
190
189
|
this.saveCoreToken(core);
|
|
190
|
+
|
|
191
|
+
// User login and trigger the dispatch at last
|
|
192
|
+
this.userLogin(user, refreshToken, dispatch);
|
|
191
193
|
}
|
|
192
194
|
|
|
193
195
|
/**
|