@norcy/react-native-toolkit 0.3.21 → 0.3.23

package/lib/commonjs/AppleLoginUtil.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.AppleLoginUtil = void 0;
 var _reactNativeAppleAuthentication = require("@invertase/react-native-apple-authentication");
 var _reactNativeDeviceInfo = require("react-native-device-info");
-var _constant = require("./constant");
 const AV = require('leancloud-storage');
 const AppleLoginUtil = exports.AppleLoginUtil = {
   // 这是监听苹果取消授权的回调，目前不需要
@@ -16,102 +15,51 @@ const AppleLoginUtil = exports.AppleLoginUtil = {
   //         });
   //     });
 
-  fetchAndUpdateCredentialState: async (user, callback) => {
+  fetchAndUpdateCredentialState: async user => {
     console.log('User 正在登录鉴权：', user);
     if (user === null) {
-      callback({
-        result: _constant.LoginState.NOTLOGIN
-      }, {
-        error: 'USER EMPTY'
-      });
+      throw new Error('USER EMPTY');
+    }
+    const credentialState = await _reactNativeAppleAuthentication.appleAuth.getCredentialStateForUser(user);
+    if (credentialState === _reactNativeAppleAuthentication.appleAuth.State.AUTHORIZED) {
+      console.log('登录鉴权成功');
     } else {
-      const credentialState = await _reactNativeAppleAuthentication.appleAuth.getCredentialStateForUser(user);
-      if (credentialState === _reactNativeAppleAuthentication.appleAuth.State.AUTHORIZED) {
-        console.log('登录鉴权成功');
-        callback({
-          result: _constant.LoginState.AUTHORIZED
-        });
-      } else {
-        console.warn('登录鉴权失败');
-        callback({
-          result: _constant.LoginState.NOTLOGIN
-        }, {
-          error: 'Authorized Failed'
-        });
-      }
+      console.warn('登录鉴权失败');
+      throw new Error('Authorized Failed');
     }
   },
   requestAppleUserForLogin: async () => {
     if (!_reactNativeAppleAuthentication.appleAuth.isSupported) {
-      return {
-        error: 'Apple Auth Not Supported'
-      };
-    }
-
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await _reactNativeAppleAuthentication.appleAuth.performRequest({
-        requestedOperation: _reactNativeAppleAuthentication.appleAuth.Operation.LOGIN,
-        requestedScopes: [_reactNativeAppleAuthentication.appleAuth.Scope.EMAIL, _reactNativeAppleAuthentication.appleAuth.Scope.FULL_NAME]
-      });
-      console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
-      const {
-        user: newUser,
-        email,
-        identityToken
-      } = appleAuthRequestResponse;
-      console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
-      return {
-        user: newUser,
-        email: email,
-        identityToken: identityToken
-      };
-    } catch (error) {
-      if (error.code === _reactNativeAppleAuthentication.appleAuth.Error.CANCELED) {
-        // console.warn('User canceled Apple Sign in.');
-        return {
-          error: 'User Cancel Login',
-          code: error.code
-        };
-      } else {
-        // console.warn('登录鉴权出错: ', error);
-        return {
-          error: 'Login Request Fail',
-          code: error.code
-        };
-      }
+      throw new Error('Apple Auth Not Supported');
     }
+    const appleAuthRequestResponse = await _reactNativeAppleAuthentication.appleAuth.performRequest({
+      requestedOperation: _reactNativeAppleAuthentication.appleAuth.Operation.LOGIN,
+      requestedScopes: [_reactNativeAppleAuthentication.appleAuth.Scope.EMAIL, _reactNativeAppleAuthentication.appleAuth.Scope.FULL_NAME]
+    });
+    console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
+    const {
+      user: newUser,
+      email,
+      identityToken
+    } = appleAuthRequestResponse;
+    console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
+    return {
+      user: newUser,
+      email,
+      identityToken
+    };
   },
   requestAppleUserForLogout: async () => {
     if (!_reactNativeAppleAuthentication.appleAuth.isSupported) {
-      throw {
-        error: 'Apple Auth Not Supported',
-        code: -1
-      };
-    }
-
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await _reactNativeAppleAuthentication.appleAuth.performRequest({
-        requestedOperation: _reactNativeAppleAuthentication.appleAuth.Operation.LOGOUT
-      });
-      console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
-      return {
-        authorizationCode: appleAuthRequestResponse.authorizationCode
-      };
-    } catch (error) {
-      if (error.code === _reactNativeAppleAuthentication.appleAuth.Error.CANCELED) {
-        throw {
-          error: 'User Cancel Logout',
-          code: error.code
-        };
-      } else {
-        throw {
-          error: 'Logout Request Fail',
-          code: error.code
-        };
-      }
+      throw new Error('Apple Auth Not Supported');
     }
+    const appleAuthRequestResponse = await _reactNativeAppleAuthentication.appleAuth.performRequest({
+      requestedOperation: _reactNativeAppleAuthentication.appleAuth.Operation.LOGOUT
+    });
+    console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
+    return {
+      authorizationCode: appleAuthRequestResponse.authorizationCode
+    };
   },
   requestDeleteAccount: async () => {
     if (_reactNativeAppleAuthentication.appleAuth.isSupported) {

package/lib/commonjs/AppleLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeAppleAuthentication","require","_reactNativeDeviceInfo","_constant","AV","AppleLoginUtil","exports","fetchAndUpdateCredentialState","user","callback","console","log","result","LoginState","NOTLOGIN","error","credentialState","appleAuth","getCredentialStateForUser","State","AUTHORIZED","warn","requestAppleUserForLogin","isSupported","appleAuthRequestResponse","performRequest","requestedOperation","Operation","LOGIN","requestedScopes","Scope","EMAIL","FULL_NAME","newUser","email","identityToken","code","Error","CANCELED","requestAppleUserForLogout","LOGOUT","authorizationCode","requestDeleteAccount","token","Cloud","run","bundleId","getBundleId"],"sourceRoot":"../../src","sources":["AppleLoginUtil.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeAppleAuthentication","require","_reactNativeDeviceInfo","AV","AppleLoginUtil","exports","fetchAndUpdateCredentialState","user","console","log","Error","credentialState","appleAuth","getCredentialStateForUser","State","AUTHORIZED","warn","requestAppleUserForLogin","isSupported","appleAuthRequestResponse","performRequest","requestedOperation","Operation","LOGIN","requestedScopes","Scope","EMAIL","FULL_NAME","newUser","email","identityToken","requestAppleUserForLogout","LOGOUT","authorizationCode","requestDeleteAccount","token","Cloud","run","bundleId","getBundleId"],"sourceRoot":"../../src","sources":["AppleLoginUtil.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/HuaweiLoginUtil.js

@@ -8,32 +8,20 @@ var _reactNative = require("react-native");
 var _PlatformHelper = require("./PlatformHelper");
 const HuaweiLoginModule = _reactNative.NativeModules.HuaweiLoginModule ?? _reactNative.TurboModuleRegistry.get('HuaweiLoginModule');
 const HuaweiLoginUtil = exports.HuaweiLoginUtil = {
-  doLogin: async callback => {
+  doLogin: async () => {
     if (_PlatformHelper.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
+    };
   }
 };
 //# sourceMappingURL=HuaweiLoginUtil.js.map

package/lib/commonjs/HuaweiLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_PlatformHelper","HuaweiLoginModule","NativeModules","TurboModuleRegistry","get","HuaweiLoginUtil","exports","doLogin","callback","PlatformHelper","isIOS","error","signIn","result","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,MAAME,iBAAiB,GACrBC,0BAAa,CAACD,iBAAiB,IAC/BE,gCAAmB,CAACC,GAAG,CAAM,mBAAmB,CAAC;AAE5C,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BE,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAIC,8BAAc,CAACC,KAAK,CAAC,CAAC,EAAE;MAC1BF,QAAQ,CAAC;QAAEG,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI,CAACV,iBAAiB,IAAI,OAAOA,iBAAiB,CAACW,MAAM,KAAK,UAAU,EAAE;MACxEJ,QAAQ,CAAC;QAAEG,KAAK,EAAE;MAAkC,CAAC,CAAC;MACtD;IACF;IACA,IAAI;MACF,MAAME,MAAM,GAAG,MAAMZ,iBAAiB,CAACW,MAAM,CAAC,CAAC;MAC/CJ,QAAQ,CAAC;QACPM,QAAQ,EAAED,MAAM,CAACC,QAAQ;QACzBC,UAAU,EAAEF,MAAM,CAACE,UAAU;QAC7BC,MAAM,EAAEH,MAAM,CAACG,MAAM;QACrBC,OAAO,EAAEJ,MAAM,CAACI;MAClB,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVV,QAAQ,CAAC;QAAEG,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_PlatformHelper","HuaweiLoginModule","NativeModules","TurboModuleRegistry","get","HuaweiLoginUtil","exports","doLogin","PlatformHelper","isIOS","Error","signIn","result","nickname","headimgurl","openid","unionid"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,eAAA,GAAAD,OAAA;AAEA,MAAME,iBAAiB,GACrBC,0BAAa,CAACD,iBAAiB,IAC/BE,gCAAmB,CAACC,GAAG,CAAM,mBAAmB,CAAC;AAE5C,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BE,OAAO,EAAE,MAAAA,CAAA,KAAyC;IAChD,IAAIC,8BAAc,CAACC,KAAK,CAAC,CAAC,EAAE;MAC1B,MAAM,IAAIC,KAAK,CAAC,sCAAsC,CAAC;IACzD;IACA,IAAI,CAACT,iBAAiB,IAAI,OAAOA,iBAAiB,CAACU,MAAM,KAAK,UAAU,EAAE;MACxE,MAAM,IAAID,KAAK,CAAC,iCAAiC,CAAC;IACpD;IACA,MAAME,MAAM,GAAG,MAAMX,iBAAiB,CAACU,MAAM,CAAC,CAAC;IAC/C,OAAO;MACLE,QAAQ,EAAED,MAAM,CAACC,QAAQ;MACzBC,UAAU,EAAEF,MAAM,CAACE,UAAU;MAC7BC,MAAM,EAAEH,MAAM,CAACG,MAAM;MACrBC,OAAO,EAAEJ,MAAM,CAACI;IAClB,CAAC;EACH;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/LoginManager.js

@@ -13,13 +13,12 @@ var _PrefData = require("./PrefData");
 var _Tool = require("./Tool");
 var _WeChatLoginUtil = require("./WeChatLoginUtil");
 var _constant = require("./constant");
-const onLoginFinish = ({
-  isAuto = false,
-  user,
-  error,
-  code
-}) => {
-  if (user) {
+const onLoginFinish = params => {
+  if ('user' in params) {
+    const {
+      isAuto = false,
+      user
+    } = params;
     _PrefData.PrefData.setValue(_PrefData.BuildInPrefs.LastLoginType, user.type);
     const data = {
       isAuto,
@@ -28,6 +27,14 @@ const onLoginFinish = ({
     console.log('onLoginSuccess', data);
     _Notification.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.code) : undefined;
     const data = {
       isAuto,
       error,
@@ -88,93 +95,75 @@ const LoginManager = exports.LoginManager = {
       }
     }
     if (type === _constant.LoginType.LoginTypeApple) {
-      const {
-        user,
-        email,
-        error,
-        code
-      } = await _AppleLoginUtil.AppleLoginUtil.requestAppleUserForLogin();
-      if (!user || error) {
-        onLoginFinish({
-          error,
-          code
-        });
-        return;
-      } else {
+      try {
+        const {
+          user,
+          email
+        } = await _AppleLoginUtil.AppleLoginUtil.requestAppleUserForLogin();
+        await _AppleLoginUtil.AppleLoginUtil.fetchAndUpdateCredentialState(user);
         let userData = {
           userId: user,
-          email: email,
+          email,
           authData: {
             openid: user,
             loginType: 'apple'
           }
         };
-        _AppleLoginUtil.AppleLoginUtil.fetchAndUpdateCredentialState(userData.userId, ({
-          result,
-          error: error2
-        }) => {
-          if (error || result !== _constant.LoginState.AUTHORIZED) {
-            onLoginFinish({
-              error: error2
-            });
-          } else {
-            loadingCallback?.();
-            doLogin(userData.authData, userData);
-          }
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
         });
       }
     } else if (type === _constant.LoginType.LoginTypeWeChat) {
-      _WeChatLoginUtil.WeChatLoginUtil.doLogin(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret, ({
-        nickname,
-        headimgurl,
-        openid,
-        unionid,
-        error
-      }) => {
-        if (error) {
-          onLoginFinish({
-            error
-          });
-        } else {
-          let userData = {
-            nickname: nickname,
-            headimgurl: headimgurl,
-            authData: {
-              openid: openid,
-              unionid: unionid,
-              loginType: 'wechat'
-            }
-          };
-          loadingCallback?.();
-          doLogin(userData.authData, userData);
-        }
-      });
+      try {
+        const {
+          nickname,
+          headimgurl,
+          openid,
+          unionid
+        } = await _WeChatLoginUtil.WeChatLoginUtil.doLogin(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret);
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: {
+            openid,
+            unionid,
+            loginType: 'wechat'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else if (type === _constant.LoginType.LoginTypeWeChatScan) {
-      _WeChatLoginUtil.WeChatLoginUtil.doLoginByScan(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret, qrcodeCallback, ({
-        nickname,
-        headimgurl,
-        openid,
-        unionid,
-        error
-      }) => {
-        if (error) {
-          onLoginFinish({
-            error
-          });
-        } else {
-          let userData = {
-            nickname: nickname,
-            headimgurl: headimgurl,
-            authData: {
-              openid: openid,
-              unionid: unionid,
-              loginType: 'wechat'
-            }
-          };
-          loadingCallback?.();
-          doLogin(userData.authData, userData);
-        }
-      });
+      try {
+        const {
+          nickname,
+          headimgurl,
+          openid,
+          unionid
+        } = await _WeChatLoginUtil.WeChatLoginUtil.doLoginByScan(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret, qrcodeCallback);
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: {
+            openid,
+            unionid,
+            loginType: 'wechat'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else if (type === _constant.LoginType.LoginTypeVisitor) {
       const uniqueId = (0, _reactNativeDeviceInfo.getUniqueIdSync)();
       console.log(uniqueId);
@@ -188,34 +177,32 @@ const LoginManager = exports.LoginManager = {
       loadingCallback?.();
       doLogin(userData.authData, userData);
     } else if (type === _constant.LoginType.LoginTypeHuawei) {
-      _HuaweiLoginUtil.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.HuaweiLoginUtil.doLogin();
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: {
+            openid,
+            unionid,
+            loginType: 'huawei'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else {
       onLoginFinish({
-        error: 'Unknown Login Type'
+        error: new Error('Unknown Login Type')
       });
     }
   },
@@ -270,14 +257,17 @@ const LoginManager = exports.LoginManager = {
   isRegisterInThisDevice: () => {
     return _PrefData.PrefData.getValue(_PrefData.BuildInPrefs.RegisterInThisDevice);
   },
-  fetchWeChatAvatar: callback => {
-    _WeChatLoginUtil.WeChatLoginUtil.doLogin(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret, ({
-      headimgurl
-    }) => {
+  fetchWeChatAvatar: async callback => {
+    try {
+      const {
+        headimgurl
+      } = await _WeChatLoginUtil.WeChatLoginUtil.doLogin(_Tool.ToolkitConfig.WeiXinId, _Tool.ToolkitConfig.WeiXinSecret);
       callback({
         headimgurl
       });
-    });
+    } catch (_) {
+      // 获取头像失败，忽略
+    }
   },
   getRegisterDays: () => {
     if (!LoginManager.isLogin()) {

package/lib/commonjs/LoginManager.js.map

@@ -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;AAkCA,MAAMS,aAAa,GAAGA,CAAC;EACrBC,MAAM,GAAG,KAAK;EACdC,IAAI;EACJC,KAAK;EACLC;AACiB,CAAC,KAAK;EACvB,IAAIF,IAAI,EAAE;IACRG,kBAAQ,CAACC,QAAQ,CAACC,sBAAY,CAACC,aAAa,EAAEN,IAAI,CAACO,IAAI,CAAC;IACxD,MAAMC,IAAI,GAAG;MAAET,MAAM;MAAEC;IAAK,CAAC;IAC7BS,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEF,IAAI,CAAC;IACnCG,0BAAY,CAACC,gBAAgB,CAAC,gBAAgB,EAAEJ,IAAI,CAAC;EACvD,CAAC,MAAM;IACL,MAAMA,IAAI,GAAG;MAAET,MAAM;MAAEE,KAAK;MAAEC;IAAK,CAAC;IACpCO,OAAO,CAACC,GAAG,CAAC,aAAa,EAAEF,IAAI,CAAC;IAChCG,0BAAY,CAACC,gBAAgB,CAAC,aAAa,EAAEJ,IAAI,CAAC;EACpD;AACF,CAAC;AAED,MAAMK,OAAO,GAAG,MAAAA,CACdC,QAA2B,EAC3BC,QAA4B,KACzB;EACH,IAAI;IACF,MAAMf,IAAI,GAAG,MAAMgB,UAAI,CAACC,iBAAiB,CAACH,QAAQ,EAAEC,QAAQ,CAAC;IAC7DjB,aAAa,CAAC;MAAEE;IAAK,CAAC,CAAC;EACzB,CAAC,CAAC,OAAOC,KAAU,EAAE;IACnBH,aAAa,CAAC;MAAEG;IAAM,CAAC,CAAC;EAC1B;AACF,CAAC;AAEM,MAAMiB,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAG;EAC1B;EACAE,SAAS,EAAE,MAAAA,CAAA,KAAY;IACrB,IAAI;MACF,MAAMpB,IAAI,GAAG,MAAMgB,UAAI,CAACI,SAAS,CAAC,CAAC;MACnCX,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;MACrBZ,aAAa,CAAC;QAAEC,MAAM,EAAE,IAAI;QAAEC;MAAK,CAAC,CAAC;IACvC,CAAC,CAAC,OAAOC,KAAU,EAAE;MACnBH,aAAa,CAAC;QAAEC,MAAM,EAAE,IAAI;QAAEE;MAAM,CAAC,CAAC;IACxC;EACF,CAAC;EAED;EACAoB,KAAK,EAAE,MAAAA,CACLd,IAAe,EACfe,WAAqC,GAAG,IAAI,EAC5CC,eAA2B,EAC3BC,cAAyC,KACtC;IACH;IACA,IAAI;MACF,MAAMxB,IAAI,GAAG,MAAMgB,UAAI,CAACI,SAAS,CAAC,CAAC;MACnCtB,aAAa,CAAC;QAAEC,MAAM,EAAE,IAAI;QAAEC;MAAK,CAAC,CAAC;MACrC;IACF,CAAC,CAAC,OAAOyB,CAAC,EAAE;MACV;IAAA;;IAGF;IACA,IAAIC,OAAO,EAAE;MACX,IAAIJ,WAAW,EAAE;QACf,MAAMT,OAAO,CAACS,WAAW,CAAC;QAC1B;MACF;IACF;IAEA,IAAIf,IAAI,KAAKoB,mBAAS,CAACC,cAAc,EAAE;MACrC,MAAM;QAAE5B,IAAI;QAAE6B,KAAK;QAAE5B,KAAK;QAAEC;MAAK,CAAC,GAChC,MAAM4B,8BAAc,CAACC,wBAAwB,CAAC,CAAC;MACjD,IAAI,CAAC/B,IAAI,IAAIC,KAAK,EAAE;QAClBH,aAAa,CAAC;UAAEG,KAAK;UAAEC;QAAK,CAAC,CAAC;QAC9B;MACF,CAAC,MAAM;QACL,IAAIa,QAAQ,GAAG;UACbiB,MAAM,EAAEhC,IAAI;UACZ6B,KAAK,EAAEA,KAAK;UACZf,QAAQ,EAAE;YACRmB,MAAM,EAAEjC,IAAI;YACZkC,SAAS,EAAE;UACb;QACF,CAAC;QAEDJ,8BAAc,CAACK,6BAA6B,CAC1CpB,QAAQ,CAACiB,MAAM,EACf,CAAC;UAAEI,MAAM;UAAEnC,KAAK,EAAEoC;QAAuC,CAAC,KAAK;UAC7D,IAAIpC,KAAK,IAAImC,MAAM,KAAKE,oBAAU,CAACC,UAAU,EAAE;YAC7CzC,aAAa,CAAC;cAAEG,KAAK,EAAEoC;YAAO,CAAC,CAAC;UAClC,CAAC,MAAM;YACLd,eAAe,GAAG,CAAC;YACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;UACtC;QACF,CACF,CAAC;MACH;IACF,CAAC,MAAM,IAAIR,IAAI,KAAKoB,mBAAS,CAACa,eAAe,EAAE;MAC7CC,gCAAe,CAAC5B,OAAO,CACrB6B,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAAY,EAC1B,CAAC;QACCC,QAAQ;QACRC,UAAU;QACVb,MAAM;QACNc,OAAO;QACP9C;MACoB,CAAC,KAAK;QAC1B,IAAIA,KAAK,EAAE;UACTH,aAAa,CAAC;YAAEG;UAAM,CAAC,CAAC;QAC1B,CAAC,MAAM;UACL,IAAIc,QAAQ,GAAG;YACb8B,QAAQ,EAAEA,QAAQ;YAClBC,UAAU,EAAEA,UAAU;YACtBhC,QAAQ,EAAE;cACRmB,MAAM,EAAEA,MAAM;cACdc,OAAO,EAAEA,OAAO;cAChBb,SAAS,EAAE;YACb;UACF,CAAC;UACDX,eAAe,GAAG,CAAC;UACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;QACtC;MACF,CACF,CAAC;IACH,CAAC,MAAM,IAAIR,IAAI,KAAKoB,mBAAS,CAACqB,mBAAmB,EAAE;MACjDP,gCAAe,CAACQ,aAAa,CAC3BP,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAAY,EAC1BpB,cAAc,EACd,CAAC;QACCqB,QAAQ;QACRC,UAAU;QACVb,MAAM;QACNc,OAAO;QACP9C;MACoB,CAAC,KAAK;QAC1B,IAAIA,KAAK,EAAE;UACTH,aAAa,CAAC;YAAEG;UAAM,CAAC,CAAC;QAC1B,CAAC,MAAM;UACL,IAAIc,QAAQ,GAAG;YACb8B,QAAQ,EAAEA,QAAQ;YAClBC,UAAU,EAAEA,UAAU;YACtBhC,QAAQ,EAAE;cACRmB,MAAM,EAAEA,MAAM;cACdc,OAAO,EAAEA,OAAO;cAChBb,SAAS,EAAE;YACb;UACF,CAAC;UACDX,eAAe,GAAG,CAAC;UACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;QACtC;MACF,CACF,CAAC;IACH,CAAC,MAAM,IAAIR,IAAI,KAAKoB,mBAAS,CAACuB,gBAAgB,EAAE;MAC9C,MAAMC,QAAQ,GAAG,IAAAC,sCAAe,EAAC,CAAC;MAClC3C,OAAO,CAACC,GAAG,CAACyC,QAAQ,CAAC;MACrB,IAAIpC,QAAQ,GAAG;QACb8B,QAAQ,EAAE,SAAS;QACnB/B,QAAQ,EAAE;UACRmB,MAAM,EAAEkB,QAAQ;UAChBjB,SAAS,EAAE;QACb;MACF,CAAC;MACDX,eAAe,GAAG,CAAC;MACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;IACtC,CAAC,MAAM,IAAIR,IAAI,KAAKoB,mBAAS,CAAC0B,eAAe,EAAE;MAC7CC,gCAAe,CAACzC,OAAO,CACrB,CAAC;QAAEgC,QAAQ;QAAEC,UAAU;QAAEb,MAAM;QAAEc,OAAO;QAAE9C;MAAM,CAAC,KAAK;QACpD,IAAIA,KAAK,EAAE;UACTH,aAAa,CAAC;YAAEG;UAAM,CAAC,CAAC;QAC1B,CAAC,MAAM;UACL,IAAIc,QAAQ,GAAG;YACb8B,QAAQ,EAAEA,QAAQ;YAClBC,UAAU,EAAEA,UAAU;YACtBhC,QAAQ,EAAE;cACRmB,MAAM,EAAEA,MAAO;cACfc,OAAO,EAAEA,OAAO;cAChBb,SAAS,EAAE;YACb;UACF,CAAC;UACDX,eAAe,GAAG,CAAC;UACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;QACtC;MACF,CACF,CAAC;IACH,CAAC,MAAM;MACLjB,aAAa,CAAC;QAAEG,KAAK,EAAE;MAAqB,CAAC,CAAC;IAChD;EACF,CAAC;EAEDsD,MAAM,EAAGC,QAAqB,IAAK;IACjC/C,OAAO,CAACC,GAAG,CAAC,UAAU,CAAC;IACvBM,UAAI,CAACuC,MAAM,CAAC,CAAC;IACbC,QAAQ,GAAG,CAAC;IACZ7C,0BAAY,CAACC,gBAAgB,CAAC,UAAU,CAAC;EAC3C,CAAC;EAED6C,OAAO,EAAEA,CAAA,KAAM;IACb,OAAOvC,YAAY,CAACwC,WAAW,CAAC,CAAC,IAAI,IAAI;EAC3C,CAAC;EAEDC,SAAS,EAAEA,CAAA,KAAM;IACf,OACEzC,YAAY,CAACuC,OAAO,CAAC,CAAC,IACtBvC,YAAY,CAACwC,WAAW,CAAC,CAAC,EAAEnD,IAAI,KAAKoB,mBAAS,CAACuB,gBAAgB;EAEnE,CAAC;EAEDQ,WAAW,EAAEA,CAAA,KAAM;IACjB,OAAO1C,UAAI,CAAC0C,WAAW,CAAC,CAAC;EAC3B,CAAC;EAEDE,eAAe,EAAE,MAAAA,CACfC,IAAc,EACdC,MAAa,EACbN,QAAoC,KACjC;IACH,IAAI;MACF/C,OAAO,CAACC,GAAG,CAAC,2BAA2B,GAAGmD,IAAI,GAAG,GAAG,GAAGC,MAAM,CAAC;MAC9D,MAAM9D,IAAI,GAAG,MAAMgB,UAAI,CAAC4C,eAAe,CAACC,IAAI,EAAEC,MAAM,CAAC;MACrDrD,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEV,IAAI,CAAC;MAC1CwD,QAAQ,GAAG,CAAC;IACd,CAAC,CAAC,OAAOO,CAAC,EAAE;MACVtD,OAAO,CAACR,KAAK,CAAC8D,CAAC,CAAC;MAChBP,QAAQ,GAAGO,CAAC,CAAC;IACf;EACF,CAAC;EAEDC,UAAU,EAAEA,CAACC,GAAW,EAAEC,KAAU,EAAEV,QAAoC,KAAK;IAC7EtC,YAAY,CAAC0C,eAAe,CAAC,CAACK,GAAG,CAAC,EAAE,CAACC,KAAK,CAAC,EAAEV,QAAQ,CAAC;EACxD,CAAC;EAEDW,UAAU,EAAE,MAAOX,QAAmC,IAAK;IACzD,IAAI;MACF,MAAME,WAAW,GAAG1C,UAAI,CAAC0C,WAAW,CAAC,CAAC;MACtC,IAAI,CAACA,WAAW,EAAE;QAChB;MACF;MACA,IAAIA,WAAW,CAACnD,IAAI,KAAKoB,mBAAS,CAACC,cAAc,EAAE;QACjD,MAAME,8BAAc,CAACsC,oBAAoB,CAAC,CAAC;MAC7C;MACA,MAAMpD,UAAI,CAACmD,UAAU,CAAC,CAAC;MACvBX,QAAQ,CAAC,CAAC;IACZ,CAAC,CAAC,OAAOvD,KAAK,EAAE;MACdQ,OAAO,CAACR,KAAK,CAACA,KAAK,CAAC;MACpBuD,QAAQ,CAACvD,KAAK,CAAC;IACjB;EACF,CAAC;EAEDoE,aAAa,EAAEA,CAAA,KAAM;IACnB,OAAOlE,kBAAQ,CAACmE,QAAQ,CAACjE,sBAAY,CAACC,aAAa,CAAC;EACtD,CAAC;EAEDiE,sBAAsB,EAAEA,CAAA,KAAM;IAC5B,OAAOpE,kBAAQ,CAACmE,QAAQ,CAACjE,sBAAY,CAACmE,oBAAoB,CAAC;EAC7D,CAAC;EAEDC,iBAAiB,EAAGjB,QAAgC,IAAK;IACvDf,gCAAe,CAAC5B,OAAO,CACrB6B,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAAY,EAC1B,CAAC;MAAEE;IAAmC,CAAC,KAAK;MAC1CU,QAAQ,CAAC;QAAEV;MAAW,CAAC,CAAC;IAC1B,CACF,CAAC;EACH,CAAC;EAED4B,eAAe,EAAEA,CAAA,KAAM;IACrB,IAAI,CAACxD,YAAY,CAACuC,OAAO,CAAC,CAAC,EAAE;MAC3B,OAAO,CAAC;IACV;IACA,MAAMkB,UAAU,GAAGzD,YAAY,CAACwC,WAAW,CAAC,CAAC,EAAEkB,SAAS;IACxD,IAAID,UAAU,EAAE;MACd,MAAME,IAAI,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,GAAGJ,UAAU,CAACI,OAAO,CAAC,CAAC;MACxD,MAAMC,OAAO,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,IAAI,CAACN,IAAI,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;MACpE,OAAOG,OAAO;IAChB;IACA,OAAO,CAAC;EACV;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeDeviceInfo","require","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","params","isAuto","user","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","error","__DEV__","Error","code","String","undefined","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","LoginTypeWeChat","nickname","headimgurl","unionid","WeChatLoginUtil","ToolkitConfig","WeiXinId","WeiXinSecret","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":[]}

package/lib/commonjs/WeChatLoginUtil.js

@@ -28,55 +28,30 @@ const createSignature = (WeiXinId, nonceStr, sdkTicket, timestamp) => {
   console.log('wx scan signature', origin, ret);
   return ret;
 };
-const getUserInfo = (WeiXinId, WeiXinSecret, code, callback) => {
-  let accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid=' + WeiXinId + '&secret=' + WeiXinSecret + '&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 getUserInfo = async (WeiXinId, WeiXinSecret, code) => {
+  const accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid=' + WeiXinId + '&secret=' + WeiXinSecret + '&code=' + code + '&grant_type=authorization_code';
+  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
+  };
 };
 const WeChatLoginUtil = exports.WeChatLoginUtil = {
-  doLogin: (WeiXinId, WeiXinSecret, callback) => {
-    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 => {
-      console.warn('wechat auth fail ', e);
-      callback({
-        error: e
-      });
-    });
+  doLogin: async (WeiXinId, WeiXinSecret) => {
+    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, WeiXinSecret, onQRGet, callback) => {
+  doLoginByScan: async (WeiXinId, WeiXinSecret, onQRGet) => {
     const accessToken = await getAccessToken(WeiXinId, WeiXinSecret);
     const ticket = await getSDKTicket(accessToken);
     const nonceStr = _Tool.Tool.generateObjectId();
@@ -84,17 +59,18 @@ const WeChatLoginUtil = exports.WeChatLoginUtil = {
     const signature = createSignature(WeiXinId, nonceStr, ticket, timestamp);
     const qrcodeEmitter = new _reactNative.NativeEventEmitter(_reactNative.NativeModules.WeChat);
     const subscription = qrcodeEmitter.addListener('onAuthGotQrcode', res => onQRGet(res.qrcode));
-    _reactNative.NativeModules.WeChat.authByScan(WeiXinId, nonceStr, timestamp, 'snsapi_userinfo', signature, '', ret => {
-      console.log('scan result', ret);
-      subscription.remove();
-      if (!ret?.authCode) {
-        callback({
-          error: 'Auth code 获取失败'
-        });
-        return;
-      }
-      getUserInfo(WeiXinId, WeiXinSecret, ret?.authCode, callback);
+    const authCode = await new Promise((resolve, reject) => {
+      _reactNative.NativeModules.WeChat.authByScan(WeiXinId, nonceStr, timestamp, 'snsapi_userinfo', signature, '', ret => {
+        console.log('scan result', ret);
+        subscription.remove();
+        if (!ret?.authCode) {
+          reject(new Error('Auth code 获取失败'));
+        } else {
+          resolve(ret.authCode);
+        }
+      });
     });
+    return getUserInfo(WeiXinId, WeiXinSecret, authCode);
   }
 };
 //# sourceMappingURL=WeChatLoginUtil.js.map