@norcy/react-native-toolkit 0.3.21 → 0.3.22

package/lib/commonjs/AppleLoginUtil.js

@@ -20,8 +20,7 @@ const AppleLoginUtil = exports.AppleLoginUtil = {
     console.log('User 正在登录鉴权：', user);
     if (user === null) {
       callback({
-        result: _constant.LoginState.NOTLOGIN
-      }, {
+        result: _constant.LoginState.NOTLOGIN,
         error: 'USER EMPTY'
       });
     } else {
@@ -34,8 +33,7 @@ const AppleLoginUtil = exports.AppleLoginUtil = {
       } else {
         console.warn('登录鉴权失败');
         callback({
-          result: _constant.LoginState.NOTLOGIN
-        }, {
+          result: _constant.LoginState.NOTLOGIN,
           error: 'Authorized Failed'
         });
       }

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","_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":[]}

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,11 @@ const onLoginFinish = ({
     console.log('onLoginSuccess', data);
     _Notification.Notification.postNotification('onLoginSuccess', data);
   } else {
+    const {
+      isAuto = false,
+      error,
+      code
+    } = params;
     const data = {
       isAuto,
       error,
@@ -111,11 +115,11 @@ const LoginManager = exports.LoginManager = {
         };
         _AppleLoginUtil.AppleLoginUtil.fetchAndUpdateCredentialState(userData.userId, ({
           result,
-          error: error2
+          error: credentialError
         }) => {
-          if (error || result !== _constant.LoginState.AUTHORIZED) {
+          if (credentialError || result !== _constant.LoginState.AUTHORIZED) {
             onLoginFinish({
-              error: error2
+              error: credentialError
             });
           } else {
             loadingCallback?.();
@@ -124,57 +128,53 @@ const LoginManager = exports.LoginManager = {
         });
       }
     } 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,31 +188,29 @@ 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'
@@ -270,14 +268,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":"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","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","code","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","credentialError","LoginState","AUTHORIZED","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

package/lib/commonjs/WeChatLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["_jsSha","require","_reactNative","WeChat","_interopRequireWildcard","_Tool","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","sha1","console","log","getUserInfo","code","callback","accessTokenUrl","then","userInfoUrl","openid","res2","nickname","headimgurl","unionid","catch","warn","error","WeChatLoginUtil","exports","doLogin","sendAuthRequest","doLoginByScan","onQRGet","Tool","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","NativeEventEmitter","NativeModules","subscription","addListener","qrcode","authByScan","remove","authCode"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_jsSha","require","_reactNative","WeChat","_interopRequireWildcard","_Tool","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","sha1","console","log","getUserInfo","code","accessTokenUrl","userInfoUrl","openid","nickname","headimgurl","unionid","WeChatLoginUtil","exports","doLogin","sendAuthRequest","Error","doLoginByScan","onQRGet","Tool","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","NativeEventEmitter","NativeModules","subscription","addListener","qrcode","authCode","Promise","resolve","reject","authByScan","remove"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/constant.js.map

@@ -1 +1 @@
-{"version":3,"names":["LoginState","exports","LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;;;;;IA4BYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAKVE,SAAS,GAAAD,OAAA,CAAAC,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}
+{"version":3,"names":["LoginState","exports","LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;;;;;IAmCYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAKVE,SAAS,GAAAD,OAAA,CAAAC,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}

package/lib/module/AppleLoginUtil.js

@@ -16,8 +16,7 @@ export const AppleLoginUtil = {
     console.log('User 正在登录鉴权：', user);
     if (user === null) {
       callback({
-        result: LoginState.NOTLOGIN
-      }, {
+        result: LoginState.NOTLOGIN,
         error: 'USER EMPTY'
       });
     } else {
@@ -30,8 +29,7 @@ export const AppleLoginUtil = {
       } else {
         console.warn('登录鉴权失败');
         callback({
-          result: LoginState.NOTLOGIN
-        }, {
+          result: LoginState.NOTLOGIN,
           error: 'Authorized Failed'
         });
       }

package/lib/module/AppleLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["appleAuth","getBundleId","LoginState","AV","require","AppleLoginUtil","fetchAndUpdateCredentialState","user","callback","console","log","result","NOTLOGIN","error","credentialState","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"],"sourceRoot":"../../src","sources":["AppleLoginUtil.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["appleAuth","getBundleId","LoginState","AV","require","AppleLoginUtil","fetchAndUpdateCredentialState","user","callback","console","log","result","NOTLOGIN","error","credentialState","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"],"sourceRoot":"../../src","sources":["AppleLoginUtil.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/HuaweiLoginUtil.js

@@ -4,32 +4,20 @@ import { NativeModules, TurboModuleRegistry } from 'react-native';
 import { PlatformHelper } from './PlatformHelper';
 const HuaweiLoginModule = NativeModules.HuaweiLoginModule ?? TurboModuleRegistry.get('HuaweiLoginModule');
 export const HuaweiLoginUtil = {
-  doLogin: async callback => {
+  doLogin: async () => {
     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
+    };
   }
 };
 //# sourceMappingURL=HuaweiLoginUtil.js.map

package/lib/module/HuaweiLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","TurboModuleRegistry","PlatformHelper","HuaweiLoginModule","get","HuaweiLoginUtil","doLogin","callback","isIOS","error","signIn","result","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,mBAAmB,QAAQ,cAAc;AACjE,SAASC,cAAc,QAAQ,kBAAkB;AAEjD,MAAMC,iBAAiB,GACrBH,aAAa,CAACG,iBAAiB,IAC/BF,mBAAmB,CAACG,GAAG,CAAM,mBAAmB,CAAC;AAEnD,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAIL,cAAc,CAACM,KAAK,CAAC,CAAC,EAAE;MAC1BD,QAAQ,CAAC;QAAEE,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI,CAACN,iBAAiB,IAAI,OAAOA,iBAAiB,CAACO,MAAM,KAAK,UAAU,EAAE;MACxEH,QAAQ,CAAC;QAAEE,KAAK,EAAE;MAAkC,CAAC,CAAC;MACtD;IACF;IACA,IAAI;MACF,MAAME,MAAM,GAAG,MAAMR,iBAAiB,CAACO,MAAM,CAAC,CAAC;MAC/CH,QAAQ,CAAC;QACPK,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;MACVT,QAAQ,CAAC;QAAEE,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["NativeModules","TurboModuleRegistry","PlatformHelper","HuaweiLoginModule","get","HuaweiLoginUtil","doLogin","isIOS","Error","signIn","result","nickname","headimgurl","openid","unionid"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,mBAAmB,QAAQ,cAAc;AAEjE,SAASC,cAAc,QAAQ,kBAAkB;AAEjD,MAAMC,iBAAiB,GACrBH,aAAa,CAACG,iBAAiB,IAC/BF,mBAAmB,CAACG,GAAG,CAAM,mBAAmB,CAAC;AAEnD,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MAAAA,CAAA,KAAyC;IAChD,IAAIJ,cAAc,CAACK,KAAK,CAAC,CAAC,EAAE;MAC1B,MAAM,IAAIC,KAAK,CAAC,sCAAsC,CAAC;IACzD;IACA,IAAI,CAACL,iBAAiB,IAAI,OAAOA,iBAAiB,CAACM,MAAM,KAAK,UAAU,EAAE;MACxE,MAAM,IAAID,KAAK,CAAC,iCAAiC,CAAC;IACpD;IACA,MAAME,MAAM,GAAG,MAAMP,iBAAiB,CAACM,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":[]}