@norcy/react-native-toolkit 0.3.21 → 0.3.23

package/src/LoginManager.ts

@@ -8,20 +8,11 @@ import { ToolkitConfig } from './Tool';
 import { WeChatLoginUtil } from './WeChatLoginUtil';
 import {
   LoginAuthDataType,
-  LoginState,
   LoginType,
   LoginUserDataType,
   UserType,
 } from './constant';
 
-type WeChatCallbackResult = {
-  nickname: string;
-  headimgurl: string;
-  openid: string;
-  unionid: string;
-  error: any;
-};
-
 type FetchImageFunctionType = ({ headimgurl }: { headimgurl: string }) => void;
 export type LoginSuccessResultType = {
   isAuto?: boolean;
@@ -33,25 +24,26 @@ 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 };
 
-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 } = params;
+    if (__DEV__ && !(error instanceof Error)) {
+      console.error('onLoginFinish: error should be an Error instance, got:', error);
+    }
+    const code =
+      error instanceof Error && 'code' in error
+        ? String((error as Error & { code: unknown }).code)
+        : undefined;
     const data = { isAuto, error, code };
     console.log('onLoginFail', data);
     Notification.postNotification('onLoginFail', data);
@@ -107,90 +99,55 @@ export const LoginManager = {
     }
 
     if (type === LoginType.LoginTypeApple) {
-      const { user, email, error, code } =
-        await AppleLoginUtil.requestAppleUserForLogin();
-      if (!user || error) {
-        onLoginFinish({ error, code });
-        return;
-      } else {
+      try {
+        const { user, email } =
+          await AppleLoginUtil.requestAppleUserForLogin();
+        await AppleLoginUtil.fetchAndUpdateCredentialState(user);
         let userData = {
           userId: user,
-          email: email,
-          authData: {
-            openid: user,
-            loginType: 'apple',
-          },
+          email,
+          authData: { openid: user, loginType: 'apple' as const },
         };
-
-        AppleLoginUtil.fetchAndUpdateCredentialState(
-          userData.userId,
-          ({ result, error: error2 }: { result: number; error: any }) => {
-            if (error || result !== LoginState.AUTHORIZED) {
-              onLoginFinish({ error: error2 });
-            } else {
-              loadingCallback?.();
-              doLogin(userData.authData, userData);
-            }
-          }
-        );
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({ error });
       }
     } 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,
-        }: WeChatCallbackResult) => {
-          if (error) {
-            onLoginFinish({ error });
-          } else {
-            let userData = {
-              nickname: nickname,
-              headimgurl: headimgurl,
-              authData: {
-                openid: openid,
-                unionid: unionid,
-                loginType: 'wechat',
-              },
-            };
-            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,
-        }: WeChatCallbackResult) => {
-          if (error) {
-            onLoginFinish({ error });
-          } else {
-            let userData = {
-              nickname: nickname,
-              headimgurl: headimgurl,
-              authData: {
-                openid: openid,
-                unionid: unionid,
-                loginType: 'wechat',
-              },
-            };
-            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);
@@ -204,27 +161,21 @@ export const LoginManager = {
       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?.();
-            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' });
+      onLoginFinish({ error: new Error('Unknown Login Type') });
     }
   },
 
@@ -266,7 +217,11 @@ export const LoginManager = {
     }
   },
 
-  updateUser: (key: string, value: any, callback?: (error?: unknown) => void) => {
+  updateUser: (
+    key: string,
+    value: any,
+    callback?: (error?: unknown) => void
+  ) => {
     LoginManager.batchUpdateUser([key], [value], callback);
   },
 
@@ -295,14 +250,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,9 +26,11 @@ export interface LoginUserDataType {
   authData: LoginAuthDataType;
 }
 
-export enum LoginState {
-  NOTLOGIN,
-  AUTHORIZED,
+export interface ThirdPartyUserInfo {
+  nickname: string;
+  headimgurl: string;
+  openid: string;
+  unionid: string;
 }
 
 export enum LoginType {