@etsoo/materialui 1.3.95 → 1.3.96
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 +4 -3
- package/package.json +1 -1
- package/src/app/ServiceApp.ts +5 -4
package/lib/app/ServiceApp.js
CHANGED
|
@@ -71,16 +71,17 @@ export class ServiceApp extends ReactApp {
|
|
|
71
71
|
* @param dispatch User state dispatch
|
|
72
72
|
*/
|
|
73
73
|
userLogin(user, refreshToken, keep, dispatch) {
|
|
74
|
-
// Super call, set token
|
|
75
|
-
super.userLogin(user, refreshToken, keep, dispatch);
|
|
76
74
|
if (user.clientDeviceId && user.passphrase) {
|
|
77
75
|
// Save the passphrase
|
|
78
|
-
|
|
76
|
+
// Interpolated string expressions are different between TypeScript and C# for the null value
|
|
77
|
+
const passphrase = this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
|
|
79
78
|
if (passphrase) {
|
|
80
79
|
this.deviceId = user.clientDeviceId;
|
|
81
80
|
this.updatePassphrase(passphrase);
|
|
82
81
|
}
|
|
83
82
|
}
|
|
83
|
+
// Super call, set token
|
|
84
|
+
super.userLogin(user, refreshToken, keep, dispatch);
|
|
84
85
|
}
|
|
85
86
|
/**
|
|
86
87
|
*
|
package/package.json
CHANGED
package/src/app/ServiceApp.ts
CHANGED
|
@@ -110,20 +110,21 @@ export class ServiceApp<
|
|
|
110
110
|
keep?: boolean,
|
|
111
111
|
dispatch?: boolean
|
|
112
112
|
): void {
|
|
113
|
-
// Super call, set token
|
|
114
|
-
super.userLogin(user, refreshToken, keep, dispatch);
|
|
115
|
-
|
|
116
113
|
if (user.clientDeviceId && user.passphrase) {
|
|
117
114
|
// Save the passphrase
|
|
115
|
+
// Interpolated string expressions are different between TypeScript and C# for the null value
|
|
118
116
|
const passphrase = this.decrypt(
|
|
119
117
|
user.passphrase,
|
|
120
|
-
`${user.uid}-${this.settings.appId}`
|
|
118
|
+
`${user.uid ?? ""}-${this.settings.appId}`
|
|
121
119
|
);
|
|
122
120
|
if (passphrase) {
|
|
123
121
|
this.deviceId = user.clientDeviceId;
|
|
124
122
|
this.updatePassphrase(passphrase);
|
|
125
123
|
}
|
|
126
124
|
}
|
|
125
|
+
|
|
126
|
+
// Super call, set token
|
|
127
|
+
super.userLogin(user, refreshToken, keep, dispatch);
|
|
127
128
|
}
|
|
128
129
|
|
|
129
130
|
/**
|