@norcy/react-native-toolkit 0.3.21 → 0.3.22

package/lib/module/LoginManager.js

@@ -9,13 +9,12 @@ import { BuildInPrefs, PrefData } from './PrefData';
 import { ToolkitConfig } from './Tool';
 import { WeChatLoginUtil } from './WeChatLoginUtil';
 import { LoginState, LoginType } from './constant';
-const onLoginFinish = ({
-  isAuto = false,
-  user,
-  error,
-  code
-}) => {
-  if (user) {
+const onLoginFinish = params => {
+  if ('user' in params) {
+    const {
+      isAuto = false,
+      user
+    } = params;
     PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
     const data = {
       isAuto,
@@ -24,6 +23,11 @@ const onLoginFinish = ({
     console.log('onLoginSuccess', data);
     Notification.postNotification('onLoginSuccess', data);
   } else {
+    const {
+      isAuto = false,
+      error,
+      code
+    } = params;
     const data = {
       isAuto,
       error,
@@ -107,11 +111,11 @@ export const LoginManager = {
         };
         AppleLoginUtil.fetchAndUpdateCredentialState(userData.userId, ({
           result,
-          error: error2
+          error: credentialError
         }) => {
-          if (error || result !== LoginState.AUTHORIZED) {
+          if (credentialError || result !== LoginState.AUTHORIZED) {
             onLoginFinish({
-              error: error2
+              error: credentialError
             });
           } else {
             loadingCallback?.();
@@ -120,57 +124,53 @@ export const LoginManager = {
         });
       }
     } else if (type === LoginType.LoginTypeWeChat) {
-      WeChatLoginUtil.doLogin(ToolkitConfig.WeiXinId, 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.doLogin(ToolkitConfig.WeiXinId, ToolkitConfig.WeiXinSecret);
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: {
+            openid,
+            unionid,
+            loginType: 'wechat'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else if (type === LoginType.LoginTypeWeChatScan) {
-      WeChatLoginUtil.doLoginByScan(ToolkitConfig.WeiXinId, 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.doLoginByScan(ToolkitConfig.WeiXinId, ToolkitConfig.WeiXinSecret, qrcodeCallback);
+        let userData = {
+          nickname,
+          headimgurl,
+          authData: {
+            openid,
+            unionid,
+            loginType: 'wechat'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else if (type === LoginType.LoginTypeVisitor) {
       const uniqueId = getUniqueIdSync();
       console.log(uniqueId);
@@ -184,31 +184,29 @@ 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'
+          }
+        };
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
+        });
+      }
     } else {
       onLoginFinish({
         error: 'Unknown Login Type'
@@ -266,14 +264,17 @@ export const LoginManager = {
   isRegisterInThisDevice: () => {
     return PrefData.getValue(BuildInPrefs.RegisterInThisDevice);
   },
-  fetchWeChatAvatar: callback => {
-    WeChatLoginUtil.doLogin(ToolkitConfig.WeiXinId, ToolkitConfig.WeiXinSecret, ({
-      headimgurl
-    }) => {
+  fetchWeChatAvatar: async callback => {
+    try {
+      const {
+        headimgurl
+      } = await WeChatLoginUtil.doLogin(ToolkitConfig.WeiXinId, ToolkitConfig.WeiXinSecret);
       callback({
         headimgurl
       });
-    });
+    } catch (_) {
+      // 获取头像失败，忽略
+    }
   },
   getRegisterDays: () => {
     if (!LoginManager.isLogin()) {

package/lib/module/LoginManager.js.map

@@ -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":"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","ignoreList":[]}
+{"version":3,"names":["getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginState","LoginType","onLoginFinish","params","isAuto","user","setValue","LastLoginType","type","data","console","log","postNotification","error","code","doLogin","authData","userData","loginWithAuthData","LoginManager","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","__DEV__","LoginTypeApple","email","requestAppleUserForLogin","userId","openid","loginType","fetchAndUpdateCredentialState","result","credentialError","AUTHORIZED","LoginTypeWeChat","nickname","headimgurl","unionid","WeiXinId","WeiXinSecret","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":[]}

package/lib/module/WeChatLoginUtil.js

@@ -24,55 +24,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
+  };
 };
 export const 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.generateObjectId();
@@ -80,17 +55,18 @@ export const WeChatLoginUtil = {
     const signature = createSignature(WeiXinId, nonceStr, ticket, timestamp);
     const qrcodeEmitter = new NativeEventEmitter(NativeModules.WeChat);
     const subscription = qrcodeEmitter.addListener('onAuthGotQrcode', res => onQRGet(res.qrcode));
-    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) => {
+      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/module/WeChatLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["sha1","NativeEventEmitter","NativeModules","WeChat","Tool","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","console","log","getUserInfo","code","callback","accessTokenUrl","then","userInfoUrl","openid","res2","nickname","headimgurl","unionid","catch","e","warn","error","WeChatLoginUtil","doLogin","sendAuthRequest","doLoginByScan","onQRGet","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","subscription","addListener","qrcode","authByScan","remove","authCode"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sha1","NativeEventEmitter","NativeModules","WeChat","Tool","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","console","log","getUserInfo","code","accessTokenUrl","userInfoUrl","openid","nickname","headimgurl","unionid","WeChatLoginUtil","doLogin","sendAuthRequest","Error","doLoginByScan","onQRGet","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","subscription","addListener","qrcode","authCode","Promise","resolve","reject","authByScan","remove"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,kBAAkB,EAAEC,aAAa,QAAQ,cAAc;AAChE,OAAO,KAAKC,MAAM,MAAM,yBAAyB;AAEjD,SAASC,IAAI,QAAQ,QAAQ;;AAE7B;AACA,MAAMC,cAAc,GAAG,MAAAA,CAAOC,QAAgB,EAAEC,YAAoB,KAAK;EACvE,IAAIC,GAAG,GACL,6EAA6E,GAC7EF,QAAQ,GACR,UAAU,GACVC,YAAY;EACd,MAAME,QAAQ,GAAG,MAAMC,KAAK,CAACF,GAAG,CAAC;EACjC,MAAMG,GAAG,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;EACjC,OAAOD,GAAG,CAACE,YAAY;AACzB,CAAC;AAED,MAAMC,YAAY,GAAG,MAAOC,WAAmB,IAAK;EAClD,IAAIP,GAAG,GACL,yEAAyE,GACzEO,WAAW;EACb,MAAMN,QAAQ,GAAG,MAAMC,KAAK,CAACF,GAAG,CAAC;EACjC,MAAMG,GAAG,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;EACjC,OAAOD,GAAG,CAACK,MAAM;AACnB,CAAC;AAED,MAAMC,eAAe,GAAGA,CACtBX,QAAgB,EAChBY,QAAgB,EAChBC,SAAiB,EACjBC,SAAiB,KACd;EACH,MAAMC,MAAM,GACV,QAAQ,GACRf,QAAQ,GACR,YAAY,GACZY,QAAQ,GACR,cAAc,GACdC,SAAS,GACT,aAAa,GACbC,SAAS;EACX,MAAME,GAAG,GAAGtB,IAAI,CAACqB,MAAM,CAAC;EACxBE,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAEH,MAAM,EAAEC,GAAG,CAAC;EAC7C,OAAOA,GAAG;AACZ,CAAC;AAED,MAAMG,WAAW,GAAG,MAAAA,CAClBnB,QAAgB,EAChBC,YAAoB,EACpBmB,IAAY,KACoB;EAChC,MAAMC,cAAc,GAClB,0DAA0D,GAC1DrB,QAAQ,GACR,UAAU,GACVC,YAAY,GACZ,QAAQ,GACRmB,IAAI,GACJ,gCAAgC;EAClC,MAAMf,GAAG,GAAG,MAAM,CAAC,MAAMD,KAAK,CAACiB,cAAc,CAAC,EAAEf,IAAI,CAAC,CAAC;EACtDW,OAAO,CAACC,GAAG,CAAC,kCAAkC,EAAEb,GAAG,CAACE,YAAY,CAAC;EAEjE,MAAMe,WAAW,GACf,sDAAsD,GACtDjB,GAAG,CAACE,YAAY,GAChB,UAAU,GACVF,GAAG,CAACkB,MAAM;EACZ,MAAMjB,IAAI,GAAG,MAAM,CAAC,MAAMF,KAAK,CAACkB,WAAW,CAAC,EAAEhB,IAAI,CAAC,CAAC;EACpDW,OAAO,CAACC,GAAG,CAAC,gCAAgC,EAAEZ,IAAI,CAAC;EAEnD,OAAO;IACLkB,QAAQ,EAAElB,IAAI,CAACkB,QAAQ;IACvBC,UAAU,EAAEnB,IAAI,CAACmB,UAAU;IAC3BF,MAAM,EAAEjB,IAAI,CAACiB,MAAM;IACnBG,OAAO,EAAEpB,IAAI,CAACoB;EAChB,CAAC;AACH,CAAC;AAED,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MAAAA,CACP5B,QAAgB,EAChBC,YAAoB,KACY;IAChC,MAAMe,GAAG,GAAG,MAAMnB,MAAM,CAACgC,eAAe,CAAC,iBAAiB,CAAC;IAC3DZ,OAAO,CAACC,GAAG,CAAC,sBAAsB,EAAEF,GAAG,CAAC;IACxC,IAAI,CAACA,GAAG,EAAEI,IAAI,EAAE;MACd,MAAM,IAAIU,KAAK,CAAC,gBAAgB,CAAC;IACnC;IACA,OAAOX,WAAW,CAACnB,QAAQ,EAAEC,YAAY,EAAEe,GAAG,CAACI,IAAI,CAAC;EACtD,CAAC;EAEDW,aAAa,EAAE,MAAAA,CACb/B,QAAgB,EAChBC,YAAoB,EACpB+B,OAAiC,KACD;IAChC,MAAMvB,WAAW,GAAG,MAAMV,cAAc,CAACC,QAAQ,EAAEC,YAAY,CAAC;IAChE,MAAMS,MAAM,GAAG,MAAMF,YAAY,CAACC,WAAW,CAAC;IAC9C,MAAMG,QAAQ,GAAGd,IAAI,CAACmC,gBAAgB,CAAC,CAAC;IACxC,MAAMnB,SAAS,GAAGoB,MAAM,CAACC,IAAI,CAACC,KAAK,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,MAAMC,SAAS,GAAG5B,eAAe,CAACX,QAAQ,EAAEY,QAAQ,EAAEF,MAAM,EAAEI,SAAS,CAAC;IAExE,MAAM0B,aAAa,GAAG,IAAI7C,kBAAkB,CAACC,aAAa,CAACC,MAAM,CAAC;IAElE,MAAM4C,YAAY,GAAGD,aAAa,CAACE,WAAW,CAAC,iBAAiB,EAAGrC,GAAG,IACpE2B,OAAO,CAAC3B,GAAG,CAACsC,MAAM,CACpB,CAAC;IAED,MAAMC,QAAQ,GAAG,MAAM,IAAIC,OAAO,CAAS,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC9DnD,aAAa,CAACC,MAAM,CAACmD,UAAU,CAC7BhD,QAAQ,EACRY,QAAQ,EACRE,SAAS,EACT,iBAAiB,EACjByB,SAAS,EACT,EAAE,EACDvB,GAAQ,IAAK;QACZC,OAAO,CAACC,GAAG,CAAC,aAAa,EAAEF,GAAG,CAAC;QAC/ByB,YAAY,CAACQ,MAAM,CAAC,CAAC;QACrB,IAAI,CAACjC,GAAG,EAAE4B,QAAQ,EAAE;UAClBG,MAAM,CAAC,IAAIjB,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrC,CAAC,MAAM;UACLgB,OAAO,CAAC9B,GAAG,CAAC4B,QAAQ,CAAC;QACvB;MACF,CACF,CAAC;IACH,CAAC,CAAC;IAEF,OAAOzB,WAAW,CAACnB,QAAQ,EAAEC,YAAY,EAAE2C,QAAQ,CAAC;EACtD;AACF,CAAC","ignoreList":[]}

package/lib/module/constant.js.map

@@ -1 +1 @@
-{"version":3,"names":["LoginState","LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;AA4BA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,SAAS,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","LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;AAmCA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,SAAS,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/typescript/AppleLoginUtil.d.ts

@@ -1,5 +1,9 @@
+import { LoginState } from './constant';
 export declare const AppleLoginUtil: {
-    fetchAndUpdateCredentialState: (user: string, callback: Function) => Promise<void>;
+    fetchAndUpdateCredentialState: (user: string, callback: (params: {
+        result: LoginState;
+        error?: string;
+    }) => void) => Promise<void>;
     requestAppleUserForLogin: () => Promise<{
         error: string;
         user?: undefined;

package/lib/typescript/AppleLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppleLoginUtil.d.ts","sourceRoot":"","sources":["../../src/AppleLoginUtil.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;0CAQmB,MAAM,YAAY,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;CA0FvE,CAAC"}
+{"version":3,"file":"AppleLoginUtil.d.ts","sourceRoot":"","sources":["../../src/AppleLoginUtil.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,eAAO,MAAM,cAAc;0CASjB,MAAM,qBACO;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;CAwFrE,CAAC"}

package/lib/typescript/HuaweiLoginUtil.d.ts

@@ -1,10 +1,5 @@
+import { ThirdPartyUserInfo } from './constant';
 export declare const HuaweiLoginUtil: {
-    doLogin: (callback: (result: {
-        nickname?: string;
-        headimgurl?: string;
-        openid?: string;
-        unionid?: string;
-        error?: any;
-    }) => void) => Promise<void>;
+    doLogin: () => Promise<ThirdPartyUserInfo>;
 };
 //# sourceMappingURL=HuaweiLoginUtil.d.ts.map

package/lib/typescript/HuaweiLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HuaweiLoginUtil.d.ts","sourceRoot":"","sources":["../../src/HuaweiLoginUtil.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,eAAe;iCAEL;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,KAAK,IAAI;CAsBb,CAAC"}
+{"version":3,"file":"HuaweiLoginUtil.d.ts","sourceRoot":"","sources":["../../src/HuaweiLoginUtil.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAOhD,eAAO,MAAM,eAAe;mBACP,QAAQ,kBAAkB,CAAC;CAe/C,CAAC"}

package/lib/typescript/LoginManager.d.ts

@@ -23,7 +23,7 @@ export declare const LoginManager: {
     deleteUser: (callback: (error?: unknown) => void) => Promise<void>;
     lastLoginType: () => any;
     isRegisterInThisDevice: () => any;
-    fetchWeChatAvatar: (callback: FetchImageFunctionType) => void;
+    fetchWeChatAvatar: (callback: FetchImageFunctionType) => Promise<void>;
     getRegisterDays: () => number;
 };
 export {};

package/lib/typescript/LoginManager.d.ts.map

@@ -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;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"}
+{"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;AAEpB,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;AAiCF,eAAO,MAAM,YAAY;;kBAcf,SAAS,sEAEE,MAAM,IAAI,6BACD,MAAM,KAAK,IAAI;wBAiHvB,MAAM,IAAI;;;;4BAuBtB,MAAM,EAAE,UACN,GAAG,EAAE,uBACO,OAAO,KAAK,IAAI;sBAc/B,MAAM,SACJ,GAAG,uBACU,OAAO,KAAK,IAAI;oCAKA,OAAO,KAAK,IAAI;;;kCAyBlB,sBAAsB;;CAwB3D,CAAC"}

package/lib/typescript/WeChatLoginUtil.d.ts

@@ -1,5 +1,6 @@
+import { ThirdPartyUserInfo } from './constant';
 export declare const WeChatLoginUtil: {
-    doLogin: (WeiXinId: string, WeiXinSecret: string, callback: Function) => void;
-    doLoginByScan: (WeiXinId: string, WeiXinSecret: string, onQRGet: (qrcode: string) => void, callback: Function) => Promise<void>;
+    doLogin: (WeiXinId: string, WeiXinSecret: string) => Promise<ThirdPartyUserInfo>;
+    doLoginByScan: (WeiXinId: string, WeiXinSecret: string, onQRGet: (qrcode: string) => void) => Promise<ThirdPartyUserInfo>;
 };
 //# sourceMappingURL=WeChatLoginUtil.d.ts.map

package/lib/typescript/WeChatLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeChatLoginUtil.d.ts","sourceRoot":"","sources":["../../src/WeChatLoginUtil.ts"],"names":[],"mappings":"AA+FA,eAAO,MAAM,eAAe;wBACN,MAAM,gBAAgB,MAAM,YAAY,QAAQ;8BAiBxD,MAAM,gBACF,MAAM,oBACF,MAAM,KAAK,IAAI,YACvB,QAAQ;CAgCrB,CAAC"}
+{"version":3,"file":"WeChatLoginUtil.d.ts","sourceRoot":"","sources":["../../src/WeChatLoginUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA4EhD,eAAO,MAAM,eAAe;wBAEd,MAAM,gBACF,MAAM,KACnB,QAAQ,kBAAkB,CAAC;8BAUlB,MAAM,gBACF,MAAM,oBACF,MAAM,KAAK,IAAI,KAChC,QAAQ,kBAAkB,CAAC;CAmC/B,CAAC"}

package/lib/typescript/constant.d.ts

@@ -23,6 +23,12 @@ export interface LoginUserDataType {
     email?: string | null;
     authData: LoginAuthDataType;
 }
+export interface ThirdPartyUserInfo {
+    nickname: string;
+    headimgurl: string;
+    openid: string;
+    unionid: string;
+}
 export declare enum LoginState {
     NOTLOGIN = 0,
     AUTHORIZED = 1

package/lib/typescript/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,oBAAY,UAAU;IACpB,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAED,oBAAY,SAAS;IACnB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,gBAAgB,IAAA;IAChB,mBAAmB,IAAA;IACnB,eAAe,IAAA;CAChB"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,UAAU;IACpB,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAED,oBAAY,SAAS;IACnB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,gBAAgB,IAAA;IAChB,mBAAmB,IAAA;IACnB,eAAe,IAAA;CAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",

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,
+    };
   },
 };