@norcy/react-native-toolkit 0.3.20 → 0.3.22

package/src/AppleLoginUtil.ts

@@ -12,11 +12,14 @@ export const AppleLoginUtil = {
   //         });
   //     });
 
-  fetchAndUpdateCredentialState: async (user: string, callback: Function) => {
+  fetchAndUpdateCredentialState: async (
+    user: string,
+    callback: (params: { result: LoginState; error?: string }) => void
+  ) => {
     console.log('User 正在登录鉴权：', user);
 
     if (user === null) {
-      callback({ result: LoginState.NOTLOGIN }, { error: 'USER EMPTY' });
+      callback({ result: LoginState.NOTLOGIN, error: 'USER EMPTY' });
     } else {
       const credentialState = await appleAuth.getCredentialStateForUser(user);
       if (credentialState === appleAuth.State.AUTHORIZED) {
@@ -24,10 +27,7 @@ export const AppleLoginUtil = {
         callback({ result: LoginState.AUTHORIZED });
       } else {
         console.warn('登录鉴权失败');
-        callback(
-          { result: LoginState.NOTLOGIN },
-          { error: 'Authorized Failed' }
-        );
+        callback({ result: LoginState.NOTLOGIN, error: 'Authorized Failed' });
       }
     }
   },

package/src/HuaweiLoginUtil.ts

@@ -1,4 +1,5 @@
 import { NativeModules, TurboModuleRegistry } from 'react-native';
+import { ThirdPartyUserInfo } from './constant';
 import { PlatformHelper } from './PlatformHelper';
 
 const HuaweiLoginModule =
@@ -6,33 +7,19 @@ const HuaweiLoginModule =
   TurboModuleRegistry.get<any>('HuaweiLoginModule');
 
 export const HuaweiLoginUtil = {
-  doLogin: async (
-    callback: (result: {
-      nickname?: string;
-      headimgurl?: string;
-      openid?: string;
-      unionid?: string;
-      error?: any;
-    }) => void
-  ) => {
+  doLogin: async (): Promise<ThirdPartyUserInfo> => {
     if (PlatformHelper.isIOS()) {
-      callback({ error: 'Huawei Login is not supported on iOS' });
-      return;
+      throw new Error('Huawei Login is not supported on iOS');
     }
     if (!HuaweiLoginModule || typeof HuaweiLoginModule.signIn !== 'function') {
-      callback({ error: 'HuaweiLoginModule not available' });
-      return;
-    }
-    try {
-      const result = await HuaweiLoginModule.signIn();
-      callback({
-        nickname: result.nickname,
-        headimgurl: result.headimgurl,
-        openid: result.openid,
-        unionid: result.unionid,
-      });
-    } catch (e) {
-      callback({ error: e });
+      throw new Error('HuaweiLoginModule not available');
     }
+    const result = await HuaweiLoginModule.signIn();
+    return {
+      nickname: result.nickname,
+      headimgurl: result.headimgurl,
+      openid: result.openid,
+      unionid: result.unionid,
+    };
   },
 };

package/src/LoginManager.ts

@@ -25,25 +25,19 @@ export type LoginFailResultType = {
   code?: string;
 };
 
-type LoginFinishParams = {
-  isAuto?: boolean;
-  user?: UserType;
-  error?: string | object;
-  code?: string;
-};
+type LoginFinishParams =
+  | { isAuto?: boolean; user: UserType }
+  | { isAuto?: boolean; error: unknown; code?: string };
 
-const onLoginFinish = ({
-  isAuto = false,
-  user,
-  error,
-  code,
-}: LoginFinishParams) => {
-  if (user) {
+const onLoginFinish = (params: LoginFinishParams) => {
+  if ('user' in params) {
+    const { isAuto = false, user } = params;
     PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
     const data = { isAuto, user };
     console.log('onLoginSuccess', data);
     Notification.postNotification('onLoginSuccess', data);
   } else {
+    const { isAuto = false, error, code } = params;
     const data = { isAuto, error, code };
     console.log('onLoginFail', data);
     Notification.postNotification('onLoginFail', data);
@@ -78,7 +72,7 @@ export const LoginManager = {
   login: async (
     type: LoginType,
     devAuthData: LoginAuthDataType | null = null,
-    loadingCallback: Function,
+    loadingCallback: () => void,
     qrcodeCallback?: (qrcode: string) => void
   ) => {
     // 如果之前已经鉴权过，则直接使用上次鉴权的 AuthData
@@ -116,85 +110,51 @@ export const LoginManager = {
 
         AppleLoginUtil.fetchAndUpdateCredentialState(
           userData.userId,
-          ({ result, error: error2 }: { result: number; error: any }) => {
-            if (error || result !== LoginState.AUTHORIZED) {
-              onLoginFinish({ error: error2 });
+          ({ result, error: credentialError }) => {
+            if (credentialError || result !== LoginState.AUTHORIZED) {
+              onLoginFinish({ error: credentialError });
             } else {
-              loadingCallback && loadingCallback();
+              loadingCallback?.();
               doLogin(userData.authData, userData);
             }
           }
         );
       }
     } else if (type === LoginType.LoginTypeWeChat) {
-      WeChatLoginUtil.doLogin(
-        ToolkitConfig.WeiXinId,
-        ToolkitConfig.WeiXinSecret,
-        ({
+      try {
+        const { nickname, headimgurl, openid, unionid } =
+          await WeChatLoginUtil.doLogin(
+            ToolkitConfig.WeiXinId,
+            ToolkitConfig.WeiXinSecret
+          );
+        let userData = {
           nickname,
           headimgurl,
-          openid,
-          unionid,
-          error,
-        }: {
-          nickname: string;
-          headimgurl: string;
-          openid: string;
-          unionid: string;
-          error: any;
-        }) => {
-          if (error) {
-            onLoginFinish({ error });
-          } else {
-            let userData = {
-              nickname: nickname,
-              headimgurl: headimgurl,
-              authData: {
-                openid: openid,
-                unionid: unionid,
-                loginType: 'wechat',
-              },
-            };
-            loadingCallback && loadingCallback();
-            doLogin(userData.authData, userData);
-          }
-        }
-      );
+          authData: { openid, unionid, loginType: 'wechat' as const },
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({ error });
+      }
     } else if (type === LoginType.LoginTypeWeChatScan) {
-      WeChatLoginUtil.doLoginByScan(
-        ToolkitConfig.WeiXinId,
-        ToolkitConfig.WeiXinSecret,
-        qrcodeCallback!,
-        ({
+      try {
+        const { nickname, headimgurl, openid, unionid } =
+          await WeChatLoginUtil.doLoginByScan(
+            ToolkitConfig.WeiXinId,
+            ToolkitConfig.WeiXinSecret,
+            qrcodeCallback!
+          );
+        let userData = {
           nickname,
           headimgurl,
-          openid,
-          unionid,
-          error,
-        }: {
-          nickname: string;
-          headimgurl: string;
-          openid: string;
-          unionid: string;
-          error: any;
-        }) => {
-          if (error) {
-            onLoginFinish({ error });
-          } else {
-            let userData = {
-              nickname: nickname,
-              headimgurl: headimgurl,
-              authData: {
-                openid: openid,
-                unionid: unionid,
-                loginType: 'wechat',
-              },
-            };
-            loadingCallback && loadingCallback();
-            doLogin(userData.authData, userData);
-          }
-        }
-      );
+          authData: { openid, unionid, loginType: 'wechat' as const },
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({ error });
+      }
     } else if (type === LoginType.LoginTypeVisitor) {
       const uniqueId = getUniqueIdSync();
       console.log(uniqueId);
@@ -205,37 +165,31 @@ export const LoginManager = {
           loginType: 'visitor',
         },
       };
-      loadingCallback && loadingCallback();
+      loadingCallback?.();
       doLogin(userData.authData, userData);
     } else if (type === LoginType.LoginTypeHuawei) {
-      HuaweiLoginUtil.doLogin(
-        ({ nickname, headimgurl, openid, unionid, error }) => {
-          if (error) {
-            onLoginFinish({ error });
-          } else {
-            let userData = {
-              nickname: nickname,
-              headimgurl: headimgurl,
-              authData: {
-                openid: openid!,
-                unionid: unionid,
-                loginType: 'huawei',
-              },
-            };
-            loadingCallback && loadingCallback();
-            doLogin(userData.authData, userData);
-          }
-        }
-      );
+      try {
+        const { nickname, headimgurl, openid, unionid } =
+          await HuaweiLoginUtil.doLogin();
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: { openid, unionid, loginType: 'huawei' as const },
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({ error });
+      }
     } else {
       onLoginFinish({ error: 'Unknown Login Type' });
     }
   },
 
-  logOut: (callback?: Function) => {
+  logOut: (callback?: () => void) => {
     console.log('onLogout');
     Auth.logOut();
-    callback && callback();
+    callback?.();
     Notification.postNotification('onLogout');
   },
 
@@ -257,24 +211,28 @@ export const LoginManager = {
   batchUpdateUser: async (
     keys: string[],
     values: any[],
-    callback?: Function
+    callback?: (error?: unknown) => void
   ) => {
     try {
       console.log('Batch Update User Begin: ' + keys + ' ' + values);
       const user = await Auth.batchUpdateUser(keys, values);
       console.log('Batch Update User End', user);
-      callback && callback();
+      callback?.();
     } catch (e) {
       console.error(e);
-      callback && callback(e);
+      callback?.(e);
     }
   },
 
-  updateUser: (key: string, value: any, callback?: Function) => {
+  updateUser: (
+    key: string,
+    value: any,
+    callback?: (error?: unknown) => void
+  ) => {
     LoginManager.batchUpdateUser([key], [value], callback);
   },
 
-  deleteUser: async (callback: Function) => {
+  deleteUser: async (callback: (error?: unknown) => void) => {
     try {
       const currentUser = Auth.currentUser();
       if (!currentUser) {
@@ -299,14 +257,16 @@ export const LoginManager = {
     return PrefData.getValue(BuildInPrefs.RegisterInThisDevice);
   },
 
-  fetchWeChatAvatar: (callback: FetchImageFunctionType) => {
-    WeChatLoginUtil.doLogin(
-      ToolkitConfig.WeiXinId,
-      ToolkitConfig.WeiXinSecret,
-      ({ headimgurl }: { headimgurl: string }) => {
-        callback({ headimgurl });
-      }
-    );
+  fetchWeChatAvatar: async (callback: FetchImageFunctionType) => {
+    try {
+      const { headimgurl } = await WeChatLoginUtil.doLogin(
+        ToolkitConfig.WeiXinId,
+        ToolkitConfig.WeiXinSecret
+      );
+      callback({ headimgurl });
+    } catch (_) {
+      // 获取头像失败，忽略
+    }
   },
 
   getRegisterDays: () => {

package/src/WeChatLoginUtil.ts

@@ -1,6 +1,7 @@
 import { sha1 } from 'js-sha1';
 import { NativeEventEmitter, NativeModules } from 'react-native';
 import * as WeChat from 'react-native-wechat-lib';
+import { ThirdPartyUserInfo } from './constant';
 import { Tool } from './Tool';
 
 // https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_access_token.html
@@ -44,13 +45,12 @@ const createSignature = (
   return ret;
 };
 
-const getUserInfo = (
+const getUserInfo = async (
   WeiXinId: string,
   WeiXinSecret: string,
-  code: string,
-  callback: Function
-) => {
-  let accessTokenUrl =
+  code: string
+): Promise<ThirdPartyUserInfo> => {
+  const accessTokenUrl =
     'https://api.weixin.qq.com/sns/oauth2/access_token?appid=' +
     WeiXinId +
     '&secret=' +
@@ -58,64 +58,43 @@ const getUserInfo = (
     '&code=' +
     code +
     '&grant_type=authorization_code';
-  fetch(accessTokenUrl)
-    .then((res) => {
-      return res.json();
-    })
-    .then((res) => {
-      console.log('wechat get access code success: ', res.access_token);
-      let userInfoUrl =
-        'https://api.weixin.qq.com/sns/userinfo?access_token=' +
-        res.access_token +
-        '&openid=' +
-        res.openid;
-      fetch(userInfoUrl)
-        .then((res2) => {
-          return res2.json();
-        })
-        .then((json) => {
-          console.log('wechat get user info success: ', json);
-          callback({
-            nickname: json.nickname,
-            headimgurl: json.headimgurl,
-            openid: json.openid,
-            unionid: json.unionid,
-          });
-        })
-        .catch((e) => {
-          console.warn('wechat get user info fail ', e);
-          callback({ error: e });
-        });
-    })
-    .catch((e) => {
-      console.warn('wechat get access code fail ', e);
-      callback({ error: e });
-    });
+  const res = await (await fetch(accessTokenUrl)).json();
+  console.log('wechat get access code success: ', res.access_token);
+
+  const userInfoUrl =
+    'https://api.weixin.qq.com/sns/userinfo?access_token=' +
+    res.access_token +
+    '&openid=' +
+    res.openid;
+  const json = await (await fetch(userInfoUrl)).json();
+  console.log('wechat get user info success: ', json);
+
+  return {
+    nickname: json.nickname,
+    headimgurl: json.headimgurl,
+    openid: json.openid,
+    unionid: json.unionid,
+  };
 };
 
 export const WeChatLoginUtil = {
-  doLogin: (WeiXinId: string, WeiXinSecret: string, callback: Function) => {
-    WeChat.sendAuthRequest('snsapi_userinfo')
-      .then((ret) => {
-        console.log('wechat auth success ', ret);
-        if (!ret?.code) {
-          callback({ error: 'Auth code 获取失败' });
-          return;
-        }
-        getUserInfo(WeiXinId, WeiXinSecret, ret?.code, callback);
-      })
-      .catch((e: any) => {
-        console.warn('wechat auth fail ', e);
-        callback({ error: e });
-      });
+  doLogin: async (
+    WeiXinId: string,
+    WeiXinSecret: string
+  ): Promise<ThirdPartyUserInfo> => {
+    const ret = await WeChat.sendAuthRequest('snsapi_userinfo');
+    console.log('wechat auth success ', ret);
+    if (!ret?.code) {
+      throw new Error('Auth code 获取失败');
+    }
+    return getUserInfo(WeiXinId, WeiXinSecret, ret.code);
   },
 
   doLoginByScan: async (
     WeiXinId: string,
     WeiXinSecret: string,
-    onQRGet: (qrcode: string) => void,
-    callback: Function
-  ) => {
+    onQRGet: (qrcode: string) => void
+  ): Promise<ThirdPartyUserInfo> => {
     const accessToken = await getAccessToken(WeiXinId, WeiXinSecret);
     const ticket = await getSDKTicket(accessToken);
     const nonceStr = Tool.generateObjectId();
@@ -128,22 +107,26 @@ export const WeChatLoginUtil = {
       onQRGet(res.qrcode)
     );
 
-    NativeModules.WeChat.authByScan(
-      WeiXinId,
-      nonceStr,
-      timestamp,
-      'snsapi_userinfo',
-      signature,
-      '',
-      (ret: any) => {
-        console.log('scan result', ret);
-        subscription.remove();
-        if (!ret?.authCode) {
-          callback({ error: 'Auth code 获取失败' });
-          return;
+    const authCode = await new Promise<string>((resolve, reject) => {
+      NativeModules.WeChat.authByScan(
+        WeiXinId,
+        nonceStr,
+        timestamp,
+        'snsapi_userinfo',
+        signature,
+        '',
+        (ret: any) => {
+          console.log('scan result', ret);
+          subscription.remove();
+          if (!ret?.authCode) {
+            reject(new Error('Auth code 获取失败'));
+          } else {
+            resolve(ret.authCode);
+          }
         }
-        getUserInfo(WeiXinId, WeiXinSecret, ret?.authCode, callback);
-      }
-    );
+      );
+    });
+
+    return getUserInfo(WeiXinId, WeiXinSecret, authCode);
   },
 };

package/src/constant.ts

@@ -26,6 +26,13 @@ export interface LoginUserDataType {
   authData: LoginAuthDataType;
 }
 
+export interface ThirdPartyUserInfo {
+  nickname: string;
+  headimgurl: string;
+  openid: string;
+  unionid: string;
+}
+
 export enum LoginState {
   NOTLOGIN,
   AUTHORIZED,