@norcy/react-native-toolkit 0.3.19 → 0.3.21
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/commonjs/LoginManager.js +9 -9
- package/lib/commonjs/LoginManager.js.map +1 -1
- package/lib/module/LoginManager.js +9 -9
- package/lib/module/LoginManager.js.map +1 -1
- package/lib/typescript/LoginManager.d.ts +6 -6
- package/lib/typescript/LoginManager.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/LoginManager.ts +25 -29
|
@@ -77,7 +77,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
77
77
|
});
|
|
78
78
|
return;
|
|
79
79
|
} catch (_) {
|
|
80
|
-
//
|
|
80
|
+
// 自动登录失败，继续正常登录流程
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
// 改为注入 delegate
|
|
@@ -118,7 +118,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
118
118
|
error: error2
|
|
119
119
|
});
|
|
120
120
|
} else {
|
|
121
|
-
loadingCallback
|
|
121
|
+
loadingCallback?.();
|
|
122
122
|
doLogin(userData.authData, userData);
|
|
123
123
|
}
|
|
124
124
|
});
|
|
@@ -145,7 +145,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
145
145
|
loginType: 'wechat'
|
|
146
146
|
}
|
|
147
147
|
};
|
|
148
|
-
loadingCallback
|
|
148
|
+
loadingCallback?.();
|
|
149
149
|
doLogin(userData.authData, userData);
|
|
150
150
|
}
|
|
151
151
|
});
|
|
@@ -171,7 +171,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
171
171
|
loginType: 'wechat'
|
|
172
172
|
}
|
|
173
173
|
};
|
|
174
|
-
loadingCallback
|
|
174
|
+
loadingCallback?.();
|
|
175
175
|
doLogin(userData.authData, userData);
|
|
176
176
|
}
|
|
177
177
|
});
|
|
@@ -185,7 +185,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
185
185
|
loginType: 'visitor'
|
|
186
186
|
}
|
|
187
187
|
};
|
|
188
|
-
loadingCallback
|
|
188
|
+
loadingCallback?.();
|
|
189
189
|
doLogin(userData.authData, userData);
|
|
190
190
|
} else if (type === _constant.LoginType.LoginTypeHuawei) {
|
|
191
191
|
_HuaweiLoginUtil.HuaweiLoginUtil.doLogin(({
|
|
@@ -209,7 +209,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
209
209
|
loginType: 'huawei'
|
|
210
210
|
}
|
|
211
211
|
};
|
|
212
|
-
loadingCallback
|
|
212
|
+
loadingCallback?.();
|
|
213
213
|
doLogin(userData.authData, userData);
|
|
214
214
|
}
|
|
215
215
|
});
|
|
@@ -222,7 +222,7 @@ const LoginManager = exports.LoginManager = {
|
|
|
222
222
|
logOut: callback => {
|
|
223
223
|
console.log('onLogout');
|
|
224
224
|
_Auth.Auth.logOut();
|
|
225
|
-
callback
|
|
225
|
+
callback?.();
|
|
226
226
|
_Notification.Notification.postNotification('onLogout');
|
|
227
227
|
},
|
|
228
228
|
isLogin: () => {
|
|
@@ -239,10 +239,10 @@ const LoginManager = exports.LoginManager = {
|
|
|
239
239
|
console.log('Batch Update User Begin: ' + keys + ' ' + values);
|
|
240
240
|
const user = await _Auth.Auth.batchUpdateUser(keys, values);
|
|
241
241
|
console.log('Batch Update User End', user);
|
|
242
|
-
callback
|
|
242
|
+
callback?.();
|
|
243
243
|
} catch (e) {
|
|
244
244
|
console.error(e);
|
|
245
|
-
callback
|
|
245
|
+
callback?.(e);
|
|
246
246
|
}
|
|
247
247
|
},
|
|
248
248
|
updateUser: (key, value, callback) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeDeviceInfo","require","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","isAuto","user","error","code","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","error2","LoginState","AUTHORIZED","LoginTypeWeChat","WeChatLoginUtil","ToolkitConfig","WeiXinId","WeiXinSecret","nickname","headimgurl","unionid","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","getUniqueIdSync","LoginTypeHuawei","HuaweiLoginUtil","logOut","callback","isLogin","currentUser","isVisitor","batchUpdateUser","keys","values","e","updateUser","key","value","deleteUser","requestDeleteAccount","lastLoginType","getValue","isRegisterInThisDevice","RegisterInThisDevice","fetchWeChatAvatar","getRegisterDays","createTime","createdAt","diff","Date","getTime","diffDay","Math","max","ceil"],"sourceRoot":"../../src","sources":["LoginManager.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,KAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AACA,IAAAQ,SAAA,GAAAR,OAAA;
|
|
1
|
+
{"version":3,"names":["_reactNativeDeviceInfo","require","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","isAuto","user","error","code","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","error2","LoginState","AUTHORIZED","LoginTypeWeChat","WeChatLoginUtil","ToolkitConfig","WeiXinId","WeiXinSecret","nickname","headimgurl","unionid","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","getUniqueIdSync","LoginTypeHuawei","HuaweiLoginUtil","logOut","callback","isLogin","currentUser","isVisitor","batchUpdateUser","keys","values","e","updateUser","key","value","deleteUser","requestDeleteAccount","lastLoginType","getValue","isRegisterInThisDevice","RegisterInThisDevice","fetchWeChatAvatar","getRegisterDays","createTime","createdAt","diff","Date","getTime","diffDay","Math","max","ceil"],"sourceRoot":"../../src","sources":["LoginManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -73,7 +73,7 @@ export const LoginManager = {
|
|
|
73
73
|
});
|
|
74
74
|
return;
|
|
75
75
|
} catch (_) {
|
|
76
|
-
//
|
|
76
|
+
// 自动登录失败，继续正常登录流程
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
// 改为注入 delegate
|
|
@@ -114,7 +114,7 @@ export const LoginManager = {
|
|
|
114
114
|
error: error2
|
|
115
115
|
});
|
|
116
116
|
} else {
|
|
117
|
-
loadingCallback
|
|
117
|
+
loadingCallback?.();
|
|
118
118
|
doLogin(userData.authData, userData);
|
|
119
119
|
}
|
|
120
120
|
});
|
|
@@ -141,7 +141,7 @@ export const LoginManager = {
|
|
|
141
141
|
loginType: 'wechat'
|
|
142
142
|
}
|
|
143
143
|
};
|
|
144
|
-
loadingCallback
|
|
144
|
+
loadingCallback?.();
|
|
145
145
|
doLogin(userData.authData, userData);
|
|
146
146
|
}
|
|
147
147
|
});
|
|
@@ -167,7 +167,7 @@ export const LoginManager = {
|
|
|
167
167
|
loginType: 'wechat'
|
|
168
168
|
}
|
|
169
169
|
};
|
|
170
|
-
loadingCallback
|
|
170
|
+
loadingCallback?.();
|
|
171
171
|
doLogin(userData.authData, userData);
|
|
172
172
|
}
|
|
173
173
|
});
|
|
@@ -181,7 +181,7 @@ export const LoginManager = {
|
|
|
181
181
|
loginType: 'visitor'
|
|
182
182
|
}
|
|
183
183
|
};
|
|
184
|
-
loadingCallback
|
|
184
|
+
loadingCallback?.();
|
|
185
185
|
doLogin(userData.authData, userData);
|
|
186
186
|
} else if (type === LoginType.LoginTypeHuawei) {
|
|
187
187
|
HuaweiLoginUtil.doLogin(({
|
|
@@ -205,7 +205,7 @@ export const LoginManager = {
|
|
|
205
205
|
loginType: 'huawei'
|
|
206
206
|
}
|
|
207
207
|
};
|
|
208
|
-
loadingCallback
|
|
208
|
+
loadingCallback?.();
|
|
209
209
|
doLogin(userData.authData, userData);
|
|
210
210
|
}
|
|
211
211
|
});
|
|
@@ -218,7 +218,7 @@ export const LoginManager = {
|
|
|
218
218
|
logOut: callback => {
|
|
219
219
|
console.log('onLogout');
|
|
220
220
|
Auth.logOut();
|
|
221
|
-
callback
|
|
221
|
+
callback?.();
|
|
222
222
|
Notification.postNotification('onLogout');
|
|
223
223
|
},
|
|
224
224
|
isLogin: () => {
|
|
@@ -235,10 +235,10 @@ export const LoginManager = {
|
|
|
235
235
|
console.log('Batch Update User Begin: ' + keys + ' ' + values);
|
|
236
236
|
const user = await Auth.batchUpdateUser(keys, values);
|
|
237
237
|
console.log('Batch Update User End', user);
|
|
238
|
-
callback
|
|
238
|
+
callback?.();
|
|
239
239
|
} catch (e) {
|
|
240
240
|
console.error(e);
|
|
241
|
-
callback
|
|
241
|
+
callback?.(e);
|
|
242
242
|
}
|
|
243
243
|
},
|
|
244
244
|
updateUser: (key, value, callback) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginState","LoginType","onLoginFinish","isAuto","user","error","code","setValue","LastLoginType","type","data","console","log","postNotification","doLogin","authData","userData","loginWithAuthData","LoginManager","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginTypeApple","email","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","error2","AUTHORIZED","LoginTypeWeChat","WeiXinId","WeiXinSecret","nickname","headimgurl","unionid","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","LoginTypeHuawei","logOut","callback","isLogin","currentUser","isVisitor","batchUpdateUser","keys","values","e","updateUser","key","value","deleteUser","requestDeleteAccount","lastLoginType","getValue","isRegisterInThisDevice","RegisterInThisDevice","fetchWeChatAvatar","getRegisterDays","createTime","createdAt","diff","Date","getTime","diffDay","Math","max","ceil"],"sourceRoot":"../../src","sources":["LoginManager.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,0BAA0B;AAC1D,SAASC,cAAc,QAAQ,kBAAkB;AACjD,SAASC,IAAI,QAAQ,QAAQ;AAC7B,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,YAAY,EAAEC,QAAQ,QAAQ,YAAY;AACnD,SAASC,aAAa,QAAQ,QAAQ;AACtC,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAEEC,UAAU,EACVC,SAAS,QAGJ,YAAY;
|
|
1
|
+
{"version":3,"names":["getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginState","LoginType","onLoginFinish","isAuto","user","error","code","setValue","LastLoginType","type","data","console","log","postNotification","doLogin","authData","userData","loginWithAuthData","LoginManager","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginTypeApple","email","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","error2","AUTHORIZED","LoginTypeWeChat","WeiXinId","WeiXinSecret","nickname","headimgurl","unionid","LoginTypeWeChatScan","doLoginByScan","LoginTypeVisitor","uniqueId","LoginTypeHuawei","logOut","callback","isLogin","currentUser","isVisitor","batchUpdateUser","keys","values","e","updateUser","key","value","deleteUser","requestDeleteAccount","lastLoginType","getValue","isRegisterInThisDevice","RegisterInThisDevice","fetchWeChatAvatar","getRegisterDays","createTime","createdAt","diff","Date","getTime","diffDay","Math","max","ceil"],"sourceRoot":"../../src","sources":["LoginManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,21 +6,21 @@ export type LoginSuccessResultType = {
|
|
|
6
6
|
isAuto?: boolean;
|
|
7
7
|
user: UserType;
|
|
8
8
|
};
|
|
9
|
-
export type
|
|
9
|
+
export type LoginFailResultType = {
|
|
10
10
|
isAuto?: boolean;
|
|
11
11
|
error: string | object;
|
|
12
12
|
code?: string;
|
|
13
13
|
};
|
|
14
14
|
export declare const LoginManager: {
|
|
15
15
|
autoLogin: () => Promise<void>;
|
|
16
|
-
login: (type: LoginType, devAuthData: LoginAuthDataType | null | undefined, loadingCallback:
|
|
17
|
-
logOut: (callback?:
|
|
16
|
+
login: (type: LoginType, devAuthData: LoginAuthDataType | null | undefined, loadingCallback: () => void, qrcodeCallback?: ((qrcode: string) => void) | undefined) => Promise<void>;
|
|
17
|
+
logOut: (callback?: () => void) => void;
|
|
18
18
|
isLogin: () => boolean;
|
|
19
19
|
isVisitor: () => boolean;
|
|
20
20
|
currentUser: () => UserType | null;
|
|
21
|
-
batchUpdateUser: (keys: string[], values: any[], callback?:
|
|
22
|
-
updateUser: (key: string, value: any, callback?:
|
|
23
|
-
deleteUser: (callback:
|
|
21
|
+
batchUpdateUser: (keys: string[], values: any[], callback?: ((error?: unknown) => void) | undefined) => Promise<void>;
|
|
22
|
+
updateUser: (key: string, value: any, callback?: ((error?: unknown) => void) | undefined) => void;
|
|
23
|
+
deleteUser: (callback: (error?: unknown) => void) => Promise<void>;
|
|
24
24
|
lastLoginType: () => any;
|
|
25
25
|
isRegisterInThisDevice: () => any;
|
|
26
26
|
fetchWeChatAvatar: (callback: FetchImageFunctionType) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginManager.d.ts","sourceRoot":"","sources":["../../src/LoginManager.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,QAAQ,EACT,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginManager.d.ts","sourceRoot":"","sources":["../../src/LoginManager.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,QAAQ,EACT,MAAM,YAAY,CAAC;AAUpB,KAAK,sBAAsB,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AAC/E,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAuCF,eAAO,MAAM,YAAY;;kBAcf,SAAS,sEAEE,MAAM,IAAI,6BACD,MAAM,KAAK,IAAI;wBA6IvB,MAAM,IAAI;;;;4BAuBtB,MAAM,EAAE,UACN,GAAG,EAAE,uBACO,OAAO,KAAK,IAAI;sBAapB,MAAM,SAAS,GAAG,uBAAsB,OAAO,KAAK,IAAI;oCAIpC,OAAO,KAAK,IAAI;;;kCAyBxB,sBAAsB;;CAsBrD,CAAC"}
|
package/package.json
CHANGED
package/src/LoginManager.ts
CHANGED
|
@@ -14,12 +14,20 @@ import {
|
|
|
14
14
|
UserType,
|
|
15
15
|
} from './constant';
|
|
16
16
|
|
|
17
|
+
type WeChatCallbackResult = {
|
|
18
|
+
nickname: string;
|
|
19
|
+
headimgurl: string;
|
|
20
|
+
openid: string;
|
|
21
|
+
unionid: string;
|
|
22
|
+
error: any;
|
|
23
|
+
};
|
|
24
|
+
|
|
17
25
|
type FetchImageFunctionType = ({ headimgurl }: { headimgurl: string }) => void;
|
|
18
26
|
export type LoginSuccessResultType = {
|
|
19
27
|
isAuto?: boolean;
|
|
20
28
|
user: UserType;
|
|
21
29
|
};
|
|
22
|
-
export type
|
|
30
|
+
export type LoginFailResultType = {
|
|
23
31
|
isAuto?: boolean;
|
|
24
32
|
error: string | object;
|
|
25
33
|
code?: string;
|
|
@@ -78,7 +86,7 @@ export const LoginManager = {
|
|
|
78
86
|
login: async (
|
|
79
87
|
type: LoginType,
|
|
80
88
|
devAuthData: LoginAuthDataType | null = null,
|
|
81
|
-
loadingCallback:
|
|
89
|
+
loadingCallback: () => void,
|
|
82
90
|
qrcodeCallback?: (qrcode: string) => void
|
|
83
91
|
) => {
|
|
84
92
|
// 如果之前已经鉴权过，则直接使用上次鉴权的 AuthData
|
|
@@ -87,7 +95,7 @@ export const LoginManager = {
|
|
|
87
95
|
onLoginFinish({ isAuto: true, user });
|
|
88
96
|
return;
|
|
89
97
|
} catch (_) {
|
|
90
|
-
//
|
|
98
|
+
// 自动登录失败，继续正常登录流程
|
|
91
99
|
}
|
|
92
100
|
|
|
93
101
|
// 改为注入 delegate
|
|
@@ -120,7 +128,7 @@ export const LoginManager = {
|
|
|
120
128
|
if (error || result !== LoginState.AUTHORIZED) {
|
|
121
129
|
onLoginFinish({ error: error2 });
|
|
122
130
|
} else {
|
|
123
|
-
loadingCallback
|
|
131
|
+
loadingCallback?.();
|
|
124
132
|
doLogin(userData.authData, userData);
|
|
125
133
|
}
|
|
126
134
|
}
|
|
@@ -136,13 +144,7 @@ export const LoginManager = {
|
|
|
136
144
|
openid,
|
|
137
145
|
unionid,
|
|
138
146
|
error,
|
|
139
|
-
}: {
|
|
140
|
-
nickname: string;
|
|
141
|
-
headimgurl: string;
|
|
142
|
-
openid: string;
|
|
143
|
-
unionid: string;
|
|
144
|
-
error: any;
|
|
145
|
-
}) => {
|
|
147
|
+
}: WeChatCallbackResult) => {
|
|
146
148
|
if (error) {
|
|
147
149
|
onLoginFinish({ error });
|
|
148
150
|
} else {
|
|
@@ -155,7 +157,7 @@ export const LoginManager = {
|
|
|
155
157
|
loginType: 'wechat',
|
|
156
158
|
},
|
|
157
159
|
};
|
|
158
|
-
loadingCallback
|
|
160
|
+
loadingCallback?.();
|
|
159
161
|
doLogin(userData.authData, userData);
|
|
160
162
|
}
|
|
161
163
|
}
|
|
@@ -171,13 +173,7 @@ export const LoginManager = {
|
|
|
171
173
|
openid,
|
|
172
174
|
unionid,
|
|
173
175
|
error,
|
|
174
|
-
}: {
|
|
175
|
-
nickname: string;
|
|
176
|
-
headimgurl: string;
|
|
177
|
-
openid: string;
|
|
178
|
-
unionid: string;
|
|
179
|
-
error: any;
|
|
180
|
-
}) => {
|
|
176
|
+
}: WeChatCallbackResult) => {
|
|
181
177
|
if (error) {
|
|
182
178
|
onLoginFinish({ error });
|
|
183
179
|
} else {
|
|
@@ -190,7 +186,7 @@ export const LoginManager = {
|
|
|
190
186
|
loginType: 'wechat',
|
|
191
187
|
},
|
|
192
188
|
};
|
|
193
|
-
loadingCallback
|
|
189
|
+
loadingCallback?.();
|
|
194
190
|
doLogin(userData.authData, userData);
|
|
195
191
|
}
|
|
196
192
|
}
|
|
@@ -205,7 +201,7 @@ export const LoginManager = {
|
|
|
205
201
|
loginType: 'visitor',
|
|
206
202
|
},
|
|
207
203
|
};
|
|
208
|
-
loadingCallback
|
|
204
|
+
loadingCallback?.();
|
|
209
205
|
doLogin(userData.authData, userData);
|
|
210
206
|
} else if (type === LoginType.LoginTypeHuawei) {
|
|
211
207
|
HuaweiLoginUtil.doLogin(
|
|
@@ -222,7 +218,7 @@ export const LoginManager = {
|
|
|
222
218
|
loginType: 'huawei',
|
|
223
219
|
},
|
|
224
220
|
};
|
|
225
|
-
loadingCallback
|
|
221
|
+
loadingCallback?.();
|
|
226
222
|
doLogin(userData.authData, userData);
|
|
227
223
|
}
|
|
228
224
|
}
|
|
@@ -232,10 +228,10 @@ export const LoginManager = {
|
|
|
232
228
|
}
|
|
233
229
|
},
|
|
234
230
|
|
|
235
|
-
logOut: (callback?:
|
|
231
|
+
logOut: (callback?: () => void) => {
|
|
236
232
|
console.log('onLogout');
|
|
237
233
|
Auth.logOut();
|
|
238
|
-
callback
|
|
234
|
+
callback?.();
|
|
239
235
|
Notification.postNotification('onLogout');
|
|
240
236
|
},
|
|
241
237
|
|
|
@@ -257,24 +253,24 @@ export const LoginManager = {
|
|
|
257
253
|
batchUpdateUser: async (
|
|
258
254
|
keys: string[],
|
|
259
255
|
values: any[],
|
|
260
|
-
callback?:
|
|
256
|
+
callback?: (error?: unknown) => void
|
|
261
257
|
) => {
|
|
262
258
|
try {
|
|
263
259
|
console.log('Batch Update User Begin: ' + keys + ' ' + values);
|
|
264
260
|
const user = await Auth.batchUpdateUser(keys, values);
|
|
265
261
|
console.log('Batch Update User End', user);
|
|
266
|
-
callback
|
|
262
|
+
callback?.();
|
|
267
263
|
} catch (e) {
|
|
268
264
|
console.error(e);
|
|
269
|
-
callback
|
|
265
|
+
callback?.(e);
|
|
270
266
|
}
|
|
271
267
|
},
|
|
272
268
|
|
|
273
|
-
updateUser: (key: string, value: any, callback?:
|
|
269
|
+
updateUser: (key: string, value: any, callback?: (error?: unknown) => void) => {
|
|
274
270
|
LoginManager.batchUpdateUser([key], [value], callback);
|
|
275
271
|
},
|
|
276
272
|
|
|
277
|
-
deleteUser: async (callback:
|
|
273
|
+
deleteUser: async (callback: (error?: unknown) => void) => {
|
|
278
274
|
try {
|
|
279
275
|
const currentUser = Auth.currentUser();
|
|
280
276
|
if (!currentUser) {
|