@norcy/react-native-toolkit 0.3.22 → 0.3.24

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,100 +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/LoginManager.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LoginManager = void 0;
+var _reactNativeAppleAuthentication = require("@invertase/react-native-apple-authentication");
 var _reactNativeDeviceInfo = require("react-native-device-info");
 var _AppleLoginUtil = require("./AppleLoginUtil");
 var _Auth = require("./Auth");
@@ -30,12 +31,15 @@ const onLoginFinish = params => {
     const {
       isAuto = false,
       error,
-      code
+      isCancel = false
     } = params;
+    if (__DEV__ && !(error instanceof Error)) {
+      console.error('onLoginFinish: error should be an Error instance, got:', error);
+    }
     const data = {
       isAuto,
       error,
-      code
+      isCancel
     };
     console.log('onLoginFail', data);
     _Notification.Notification.postNotification('onLoginFail', data);
@@ -92,39 +96,27 @@ 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: credentialError
-        }) => {
-          if (credentialError || result !== _constant.LoginState.AUTHORIZED) {
-            onLoginFinish({
-              error: credentialError
-            });
-          } else {
-            loadingCallback?.();
-            doLogin(userData.authData, userData);
-          }
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        const code = error instanceof Error && 'code' in error ? error.code : undefined;
+        onLoginFinish({
+          error,
+          isCancel: code === _reactNativeAppleAuthentication.appleAuth.Error.CANCELED
         });
       }
     } else if (type === _constant.LoginType.LoginTypeWeChat) {
@@ -213,7 +205,7 @@ const LoginManager = exports.LoginManager = {
       }
     } else {
       onLoginFinish({
-        error: 'Unknown Login Type'
+        error: new Error('Unknown Login Type')
       });
     }
   },

package/lib/commonjs/LoginManager.js.map

@@ -1 +1 @@
-{"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":";;;;;;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;AAuBA,MAAMS,aAAa,GAAIC,MAAyB,IAAK;EACnD,IAAI,MAAM,IAAIA,MAAM,EAAE;IACpB,MAAM;MAAEC,MAAM,GAAG,KAAK;MAAEC;IAAK,CAAC,GAAGF,MAAM;IACvCG,kBAAQ,CAACC,QAAQ,CAACC,sBAAY,CAACC,aAAa,EAAEJ,IAAI,CAACK,IAAI,CAAC;IACxD,MAAMC,IAAI,GAAG;MAAEP,MAAM;MAAEC;IAAK,CAAC;IAC7BO,OAAO,CAACC,GAAG,CAAC,gBAAgB,EAAEF,IAAI,CAAC;IACnCG,0BAAY,CAACC,gBAAgB,CAAC,gBAAgB,EAAEJ,IAAI,CAAC;EACvD,CAAC,MAAM;IACL,MAAM;MAAEP,MAAM,GAAG,KAAK;MAAEY,KAAK;MAAEC;IAAK,CAAC,GAAGd,MAAM;IAC9C,MAAMQ,IAAI,GAAG;MAAEP,MAAM;MAAEY,KAAK;MAAEC;IAAK,CAAC;IACpCL,OAAO,CAACC,GAAG,CAAC,aAAa,EAAEF,IAAI,CAAC;IAChCG,0BAAY,CAACC,gBAAgB,CAAC,aAAa,EAAEJ,IAAI,CAAC;EACpD;AACF,CAAC;AAED,MAAMO,OAAO,GAAG,MAAAA,CACdC,QAA2B,EAC3BC,QAA4B,KACzB;EACH,IAAI;IACF,MAAMf,IAAI,GAAG,MAAMgB,UAAI,CAACC,iBAAiB,CAACH,QAAQ,EAAEC,QAAQ,CAAC;IAC7DlB,aAAa,CAAC;MAAEG;IAAK,CAAC,CAAC;EACzB,CAAC,CAAC,OAAOW,KAAU,EAAE;IACnBd,aAAa,CAAC;MAAEc;IAAM,CAAC,CAAC;EAC1B;AACF,CAAC;AAEM,MAAMO,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;MACnCb,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;MACrBX,aAAa,CAAC;QAAEE,MAAM,EAAE,IAAI;QAAEC;MAAK,CAAC,CAAC;IACvC,CAAC,CAAC,OAAOW,KAAU,EAAE;MACnBd,aAAa,CAAC;QAAEE,MAAM,EAAE,IAAI;QAAEY;MAAM,CAAC,CAAC;IACxC;EACF,CAAC;EAED;EACAU,KAAK,EAAE,MAAAA,CACLhB,IAAe,EACfiB,WAAqC,GAAG,IAAI,EAC5CC,eAA2B,EAC3BC,cAAyC,KACtC;IACH;IACA,IAAI;MACF,MAAMxB,IAAI,GAAG,MAAMgB,UAAI,CAACI,SAAS,CAAC,CAAC;MACnCvB,aAAa,CAAC;QAAEE,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,IAAIjB,IAAI,KAAKsB,mBAAS,CAACC,cAAc,EAAE;MACrC,MAAM;QAAE5B,IAAI;QAAE6B,KAAK;QAAElB,KAAK;QAAEC;MAAK,CAAC,GAChC,MAAMkB,8BAAc,CAACC,wBAAwB,CAAC,CAAC;MACjD,IAAI,CAAC/B,IAAI,IAAIW,KAAK,EAAE;QAClBd,aAAa,CAAC;UAAEc,KAAK;UAAEC;QAAK,CAAC,CAAC;QAC9B;MACF,CAAC,MAAM;QACL,IAAIG,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;UAAEzB,KAAK,EAAE0B;QAAgB,CAAC,KAAK;UACtC,IAAIA,eAAe,IAAID,MAAM,KAAKE,oBAAU,CAACC,UAAU,EAAE;YACvD1C,aAAa,CAAC;cAAEc,KAAK,EAAE0B;YAAgB,CAAC,CAAC;UAC3C,CAAC,MAAM;YACLd,eAAe,GAAG,CAAC;YACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;UACtC;QACF,CACF,CAAC;MACH;IACF,CAAC,MAAM,IAAIV,IAAI,KAAKsB,mBAAS,CAACa,eAAe,EAAE;MAC7C,IAAI;QACF,MAAM;UAAEC,QAAQ;UAAEC,UAAU;UAAET,MAAM;UAAEU;QAAQ,CAAC,GAC7C,MAAMC,gCAAe,CAAC/B,OAAO,CAC3BgC,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAChB,CAAC;QACH,IAAIhC,QAAQ,GAAG;UACb0B,QAAQ;UACRC,UAAU;UACV5B,QAAQ,EAAE;YAAEmB,MAAM;YAAEU,OAAO;YAAET,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDX,eAAe,GAAG,CAAC;QACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAOJ,KAAK,EAAE;QACdd,aAAa,CAAC;UAAEc;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM,IAAIN,IAAI,KAAKsB,mBAAS,CAACqB,mBAAmB,EAAE;MACjD,IAAI;QACF,MAAM;UAAEP,QAAQ;UAAEC,UAAU;UAAET,MAAM;UAAEU;QAAQ,CAAC,GAC7C,MAAMC,gCAAe,CAACK,aAAa,CACjCJ,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAAY,EAC1BvB,cACF,CAAC;QACH,IAAIT,QAAQ,GAAG;UACb0B,QAAQ;UACRC,UAAU;UACV5B,QAAQ,EAAE;YAAEmB,MAAM;YAAEU,OAAO;YAAET,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDX,eAAe,GAAG,CAAC;QACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAOJ,KAAK,EAAE;QACdd,aAAa,CAAC;UAAEc;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM,IAAIN,IAAI,KAAKsB,mBAAS,CAACuB,gBAAgB,EAAE;MAC9C,MAAMC,QAAQ,GAAG,IAAAC,sCAAe,EAAC,CAAC;MAClC7C,OAAO,CAACC,GAAG,CAAC2C,QAAQ,CAAC;MACrB,IAAIpC,QAAQ,GAAG;QACb0B,QAAQ,EAAE,SAAS;QACnB3B,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,IAAIV,IAAI,KAAKsB,mBAAS,CAAC0B,eAAe,EAAE;MAC7C,IAAI;QACF,MAAM;UAAEZ,QAAQ;UAAEC,UAAU;UAAET,MAAM;UAAEU;QAAQ,CAAC,GAC7C,MAAMW,gCAAe,CAACzC,OAAO,CAAC,CAAC;QACjC,IAAIE,QAAQ,GAAG;UACb0B,QAAQ;UACRC,UAAU;UACV5B,QAAQ,EAAE;YAAEmB,MAAM;YAAEU,OAAO;YAAET,SAAS,EAAE;UAAkB;QAC5D,CAAC;QACDX,eAAe,GAAG,CAAC;QACnBV,OAAO,CAACE,QAAQ,CAACD,QAAQ,EAAEC,QAAQ,CAAC;MACtC,CAAC,CAAC,OAAOJ,KAAK,EAAE;QACdd,aAAa,CAAC;UAAEc;QAAM,CAAC,CAAC;MAC1B;IACF,CAAC,MAAM;MACLd,aAAa,CAAC;QAAEc,KAAK,EAAE;MAAqB,CAAC,CAAC;IAChD;EACF,CAAC;EAED4C,MAAM,EAAGC,QAAqB,IAAK;IACjCjD,OAAO,CAACC,GAAG,CAAC,UAAU,CAAC;IACvBQ,UAAI,CAACuC,MAAM,CAAC,CAAC;IACbC,QAAQ,GAAG,CAAC;IACZ/C,0BAAY,CAACC,gBAAgB,CAAC,UAAU,CAAC;EAC3C,CAAC;EAED+C,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,EAAErD,IAAI,KAAKsB,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;MACFjD,OAAO,CAACC,GAAG,CAAC,2BAA2B,GAAGqD,IAAI,GAAG,GAAG,GAAGC,MAAM,CAAC;MAC9D,MAAM9D,IAAI,GAAG,MAAMgB,UAAI,CAAC4C,eAAe,CAACC,IAAI,EAAEC,MAAM,CAAC;MACrDvD,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAER,IAAI,CAAC;MAC1CwD,QAAQ,GAAG,CAAC;IACd,CAAC,CAAC,OAAOO,CAAC,EAAE;MACVxD,OAAO,CAACI,KAAK,CAACoD,CAAC,CAAC;MAChBP,QAAQ,GAAGO,CAAC,CAAC;IACf;EACF,CAAC;EAEDC,UAAU,EAAEA,CACVC,GAAW,EACXC,KAAU,EACVV,QAAoC,KACjC;IACHtC,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,CAACrD,IAAI,KAAKsB,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,OAAO7C,KAAK,EAAE;MACdJ,OAAO,CAACI,KAAK,CAACA,KAAK,CAAC;MACpB6C,QAAQ,CAAC7C,KAAK,CAAC;IACjB;EACF,CAAC;EAED0D,aAAa,EAAEA,CAAA,KAAM;IACnB,OAAOpE,kBAAQ,CAACqE,QAAQ,CAACnE,sBAAY,CAACC,aAAa,CAAC;EACtD,CAAC;EAEDmE,sBAAsB,EAAEA,CAAA,KAAM;IAC5B,OAAOtE,kBAAQ,CAACqE,QAAQ,CAACnE,sBAAY,CAACqE,oBAAoB,CAAC;EAC7D,CAAC;EAEDC,iBAAiB,EAAE,MAAOjB,QAAgC,IAAK;IAC7D,IAAI;MACF,MAAM;QAAEd;MAAW,CAAC,GAAG,MAAME,gCAAe,CAAC/B,OAAO,CAClDgC,mBAAa,CAACC,QAAQ,EACtBD,mBAAa,CAACE,YAChB,CAAC;MACDS,QAAQ,CAAC;QAAEd;MAAW,CAAC,CAAC;IAC1B,CAAC,CAAC,OAAOjB,CAAC,EAAE;MACV;IAAA;EAEJ,CAAC;EAEDiD,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":["_reactNativeAppleAuthentication","require","_reactNativeDeviceInfo","_AppleLoginUtil","_Auth","_HuaweiLoginUtil","_Notification","_PrefData","_Tool","_WeChatLoginUtil","_constant","onLoginFinish","params","isAuto","user","PrefData","setValue","BuildInPrefs","LastLoginType","type","data","console","log","Notification","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","code","undefined","appleAuth","CANCELED","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/constant.js

@@ -3,12 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LoginType = exports.LoginState = void 0;
-let LoginState = exports.LoginState = /*#__PURE__*/function (LoginState) {
-  LoginState[LoginState["NOTLOGIN"] = 0] = "NOTLOGIN";
-  LoginState[LoginState["AUTHORIZED"] = 1] = "AUTHORIZED";
-  return LoginState;
-}({});
+exports.LoginType = void 0;
 let LoginType = exports.LoginType = /*#__PURE__*/function (LoginType) {
   LoginType[LoginType["LoginTypeApple"] = 0] = "LoginTypeApple";
   LoginType[LoginType["LoginTypeWeChat"] = 1] = "LoginTypeWeChat";

package/lib/commonjs/constant.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["LoginType","exports"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;;;;;IAmCYA,SAAS,GAAAC,OAAA,CAAAD,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

@@ -2,7 +2,6 @@
 
 import { appleAuth } from '@invertase/react-native-apple-authentication';
 import { getBundleId } from 'react-native-device-info';
-import { LoginState } from './constant';
 const AV = require('leancloud-storage');
 export const AppleLoginUtil = {
   // 这是监听苹果取消授权的回调，目前不需要
@@ -12,100 +11,51 @@ export const AppleLoginUtil = {
   //         });
   //     });
 
-  fetchAndUpdateCredentialState: async (user, callback) => {
+  fetchAndUpdateCredentialState: async user => {
     console.log('User 正在登录鉴权：', user);
     if (user === null) {
-      callback({
-        result: LoginState.NOTLOGIN,
-        error: 'USER EMPTY'
-      });
+      throw new Error('USER EMPTY');
+    }
+    const credentialState = await appleAuth.getCredentialStateForUser(user);
+    if (credentialState === appleAuth.State.AUTHORIZED) {
+      console.log('登录鉴权成功');
     } else {
-      const credentialState = await appleAuth.getCredentialStateForUser(user);
-      if (credentialState === appleAuth.State.AUTHORIZED) {
-        console.log('登录鉴权成功');
-        callback({
-          result: LoginState.AUTHORIZED
-        });
-      } else {
-        console.warn('登录鉴权失败');
-        callback({
-          result: LoginState.NOTLOGIN,
-          error: 'Authorized Failed'
-        });
-      }
+      console.warn('登录鉴权失败');
+      throw new Error('Authorized Failed');
     }
   },
   requestAppleUserForLogin: async () => {
     if (!appleAuth.isSupported) {
-      return {
-        error: 'Apple Auth Not Supported'
-      };
-    }
-
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await appleAuth.performRequest({
-        requestedOperation: appleAuth.Operation.LOGIN,
-        requestedScopes: [appleAuth.Scope.EMAIL, 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 === 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 appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGIN,
+      requestedScopes: [appleAuth.Scope.EMAIL, 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 (!appleAuth.isSupported) {
-      throw {
-        error: 'Apple Auth Not Supported',
-        code: -1
-      };
-    }
-
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await appleAuth.performRequest({
-        requestedOperation: appleAuth.Operation.LOGOUT
-      });
-      console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
-      return {
-        authorizationCode: appleAuthRequestResponse.authorizationCode
-      };
-    } catch (error) {
-      if (error.code === 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 appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGOUT
+    });
+    console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
+    return {
+      authorizationCode: appleAuthRequestResponse.authorizationCode
+    };
   },
   requestDeleteAccount: async () => {
     if (appleAuth.isSupported) {

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":";;AAAA,SAASA,SAAS,QAAQ,8CAA8C;AACxE,SAASC,WAAW,QAAQ,0BAA0B;AACtD,SAASC,UAAU,QAAQ,YAAY;AAEvC,MAAMC,EAAE,GAAGC,OAAO,CAAC,mBAAmB,CAAC;AAEvC,OAAO,MAAMC,cAAc,GAAG;EAC5B;EACA;EACA;EACA;EACA;EACA;;EAEAC,6BAA6B,EAAE,MAAAA,CAC7BC,IAAY,EACZC,QAAkE,KAC/D;IACHC,OAAO,CAACC,GAAG,CAAC,cAAc,EAAEH,IAAI,CAAC;IAEjC,IAAIA,IAAI,KAAK,IAAI,EAAE;MACjBC,QAAQ,CAAC;QAAEG,MAAM,EAAET,UAAU,CAACU,QAAQ;QAAEC,KAAK,EAAE;MAAa,CAAC,CAAC;IAChE,CAAC,MAAM;MACL,MAAMC,eAAe,GAAG,MAAMd,SAAS,CAACe,yBAAyB,CAACR,IAAI,CAAC;MACvE,IAAIO,eAAe,KAAKd,SAAS,CAACgB,KAAK,CAACC,UAAU,EAAE;QAClDR,OAAO,CAACC,GAAG,CAAC,QAAQ,CAAC;QACrBF,QAAQ,CAAC;UAAEG,MAAM,EAAET,UAAU,CAACe;QAAW,CAAC,CAAC;MAC7C,CAAC,MAAM;QACLR,OAAO,CAACS,IAAI,CAAC,QAAQ,CAAC;QACtBV,QAAQ,CAAC;UAAEG,MAAM,EAAET,UAAU,CAACU,QAAQ;UAAEC,KAAK,EAAE;QAAoB,CAAC,CAAC;MACvE;IACF;EACF,CAAC;EAEDM,wBAAwB,EAAE,MAAAA,CAAA,KAAY;IACpC,IAAI,CAACnB,SAAS,CAACoB,WAAW,EAAE;MAC1B,OAAO;QAAEP,KAAK,EAAE;MAA2B,CAAC;IAC9C;;IAEA;IACA,IAAI;MACF,MAAMQ,wBAAwB,GAAG,MAAMrB,SAAS,CAACsB,cAAc,CAAC;QAC9DC,kBAAkB,EAAEvB,SAAS,CAACwB,SAAS,CAACC,KAAK;QAC7CC,eAAe,EAAE,CAAC1B,SAAS,CAAC2B,KAAK,CAACC,KAAK,EAAE5B,SAAS,CAAC2B,KAAK,CAACE,SAAS;MACpE,CAAC,CAAC;MAEFpB,OAAO,CAACC,GAAG,CAAC,gCAAgC,EAAEW,wBAAwB,CAAC;MAEvE,MAAM;QAAEd,IAAI,EAAEuB,OAAO;QAAEC,KAAK;QAAEC;MAAc,CAAC,GAAGX,wBAAwB;MAExEZ,OAAO,CAACC,GAAG,CAAC,mCAAmCoB,OAAO,KAAKC,KAAK,EAAE,CAAC;MAEnE,OAAO;QAAExB,IAAI,EAAEuB,OAAO;QAAEC,KAAK,EAAEA,KAAK;QAAEC,aAAa,EAAEA;MAAc,CAAC;IACtE,CAAC,CAAC,OAAOnB,KAAU,EAAE;MACnB,IAAIA,KAAK,CAACoB,IAAI,KAAKjC,SAAS,CAACkC,KAAK,CAACC,QAAQ,EAAE;QAC3C;QACA,OAAO;UAAEtB,KAAK,EAAE,mBAAmB;UAAEoB,IAAI,EAAEpB,KAAK,CAACoB;QAAK,CAAC;MACzD,CAAC,MAAM;QACL;QACA,OAAO;UAAEpB,KAAK,EAAE,oBAAoB;UAAEoB,IAAI,EAAEpB,KAAK,CAACoB;QAAK,CAAC;MAC1D;IACF;EACF,CAAC;EAEDG,yBAAyB,EAAE,MAAAA,CAAA,KAAY;IACrC,IAAI,CAACpC,SAAS,CAACoB,WAAW,EAAE;MAC1B,MAAM;QAAEP,KAAK,EAAE,0BAA0B;QAAEoB,IAAI,EAAE,CAAC;MAAE,CAAC;IACvD;;IAEA;IACA,IAAI;MACF,MAAMZ,wBAAwB,GAAG,MAAMrB,SAAS,CAACsB,cAAc,CAAC;QAC9DC,kBAAkB,EAAEvB,SAAS,CAACwB,SAAS,CAACa;MAC1C,CAAC,CAAC;MAEF5B,OAAO,CAACC,GAAG,CAAC,iCAAiC,EAAEW,wBAAwB,CAAC;MAExE,OAAO;QAAEiB,iBAAiB,EAAEjB,wBAAwB,CAACiB;MAAkB,CAAC;IAC1E,CAAC,CAAC,OAAOzB,KAAU,EAAE;MACnB,IAAIA,KAAK,CAACoB,IAAI,KAAKjC,SAAS,CAACkC,KAAK,CAACC,QAAQ,EAAE;QAC3C,MAAM;UAAEtB,KAAK,EAAE,oBAAoB;UAAEoB,IAAI,EAAEpB,KAAK,CAACoB;QAAK,CAAC;MACzD,CAAC,MAAM;QACL,MAAM;UAAEpB,KAAK,EAAE,qBAAqB;UAAEoB,IAAI,EAAEpB,KAAK,CAACoB;QAAK,CAAC;MAC1D;IACF;EACF,CAAC;EAEDM,oBAAoB,EAAE,MAAAA,CAAA,KAAY;IAChC,IAAIvC,SAAS,CAACoB,WAAW,EAAE;MACzB,MAAM;QAAEkB;MAAkB,CAAC,GACzB,MAAMjC,cAAc,CAAC+B,yBAAyB,CAAC,CAAC;MAClD3B,OAAO,CAACC,GAAG,CAAC,+BAA+B,EAAE4B,iBAAiB,CAAC;MAC/D,MAAM;QAAEE;MAAM,CAAC,GAAG,MAAMrC,EAAE,CAACsC,KAAK,CAACC,GAAG,CAAC,UAAU,EAAE;QAC/CJ,iBAAiB;QACjBK,QAAQ,EAAE1C,WAAW,CAAC;MACxB,CAAC,CAAC;MACFQ,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAE8B,KAAK,CAAC;MACvC,MAAMrC,EAAE,CAACsC,KAAK,CAACC,GAAG,CAAC,oBAAoB,EAAE;QACvCF,KAAK;QACLG,QAAQ,EAAE1C,WAAW,CAAC;MACxB,CAAC,CAAC;MACFQ,OAAO,CAACC,GAAG,CAAC,wBAAwB,CAAC;IACvC;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["appleAuth","getBundleId","AV","require","AppleLoginUtil","fetchAndUpdateCredentialState","user","console","log","Error","credentialState","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"],"sourceRoot":"../../src","sources":["AppleLoginUtil.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/LoginManager.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { appleAuth } from '@invertase/react-native-apple-authentication';
 import { getUniqueIdSync } from 'react-native-device-info';
 import { AppleLoginUtil } from './AppleLoginUtil';
 import { Auth } from './Auth';
@@ -8,7 +9,7 @@ import { Notification } from './Notification';
 import { BuildInPrefs, PrefData } from './PrefData';
 import { ToolkitConfig } from './Tool';
 import { WeChatLoginUtil } from './WeChatLoginUtil';
-import { LoginState, LoginType } from './constant';
+import { LoginType } from './constant';
 const onLoginFinish = params => {
   if ('user' in params) {
     const {
@@ -26,12 +27,15 @@ const onLoginFinish = params => {
     const {
       isAuto = false,
       error,
-      code
+      isCancel = false
     } = params;
+    if (__DEV__ && !(error instanceof Error)) {
+      console.error('onLoginFinish: error should be an Error instance, got:', error);
+    }
     const data = {
       isAuto,
       error,
-      code
+      isCancel
     };
     console.log('onLoginFail', data);
     Notification.postNotification('onLoginFail', data);
@@ -88,39 +92,27 @@ 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,
+          email,
           authData: {
             openid: user,
             loginType: 'apple'
           }
         };
-        AppleLoginUtil.fetchAndUpdateCredentialState(userData.userId, ({
-          result,
-          error: credentialError
-        }) => {
-          if (credentialError || result !== LoginState.AUTHORIZED) {
-            onLoginFinish({
-              error: credentialError
-            });
-          } else {
-            loadingCallback?.();
-            doLogin(userData.authData, userData);
-          }
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        const code = error instanceof Error && 'code' in error ? error.code : undefined;
+        onLoginFinish({
+          error,
+          isCancel: code === appleAuth.Error.CANCELED
         });
       }
     } else if (type === LoginType.LoginTypeWeChat) {
@@ -209,7 +201,7 @@ export const LoginManager = {
       }
     } else {
       onLoginFinish({
-        error: 'Unknown Login Type'
+        error: new Error('Unknown Login Type')
       });
     }
   },

package/lib/module/LoginManager.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["appleAuth","getUniqueIdSync","AppleLoginUtil","Auth","HuaweiLoginUtil","Notification","BuildInPrefs","PrefData","ToolkitConfig","WeChatLoginUtil","LoginType","onLoginFinish","params","isAuto","user","setValue","LastLoginType","type","data","console","log","postNotification","error","isCancel","__DEV__","Error","doLogin","authData","userData","loginWithAuthData","LoginManager","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","LoginTypeApple","email","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","code","undefined","CANCELED","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/constant.js

@@ -1,10 +1,5 @@
 "use strict";
 
-export let LoginState = /*#__PURE__*/function (LoginState) {
-  LoginState[LoginState["NOTLOGIN"] = 0] = "NOTLOGIN";
-  LoginState[LoginState["AUTHORIZED"] = 1] = "AUTHORIZED";
-  return LoginState;
-}({});
 export let LoginType = /*#__PURE__*/function (LoginType) {
   LoginType[LoginType["LoginTypeApple"] = 0] = "LoginTypeApple";
   LoginType[LoginType["LoginTypeWeChat"] = 1] = "LoginTypeWeChat";

package/lib/module/constant.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;AAmCA,WAAYA,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,27 +1,9 @@
-import { LoginState } from './constant';
 export declare const AppleLoginUtil: {
-    fetchAndUpdateCredentialState: (user: string, callback: (params: {
-        result: LoginState;
-        error?: string;
-    }) => void) => Promise<void>;
+    fetchAndUpdateCredentialState: (user: string) => Promise<void>;
     requestAppleUserForLogin: () => Promise<{
-        error: string;
-        user?: undefined;
-        email?: undefined;
-        identityToken?: undefined;
-        code?: undefined;
-    } | {
         user: string;
         email: string | null;
         identityToken: string | null;
-        error?: undefined;
-        code?: undefined;
-    } | {
-        error: string;
-        code: any;
-        user?: undefined;
-        email?: undefined;
-        identityToken?: undefined;
     }>;
     requestAppleUserForLogout: () => Promise<{
         authorizationCode: string | null;

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"AppleLoginUtil.d.ts","sourceRoot":"","sources":["../../src/AppleLoginUtil.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc;0CAQmB,MAAM,KAAG,QAAQ,IAAI,CAAC;;cAiB1D,MAAM;eACL,MAAM,GAAG,IAAI;uBACL,MAAM,GAAG,IAAI;;;;;;CAmD/B,CAAC"}

package/lib/typescript/LoginManager.d.ts

@@ -3,13 +3,13 @@ type FetchImageFunctionType = ({ headimgurl }: {
     headimgurl: string;
 }) => void;
 export type LoginSuccessResultType = {
-    isAuto?: boolean;
+    isAuto: boolean;
     user: UserType;
 };
 export type LoginFailResultType = {
-    isAuto?: boolean;
-    error: string | object;
-    code?: string;
+    isAuto: boolean;
+    error: unknown;
+    isCancel: boolean;
 };
 export declare const LoginManager: {
     autoLogin: () => Promise<void>;

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;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"}
+{"version":3,"file":"LoginManager.d.ts","sourceRoot":"","sources":["../../src/LoginManager.ts"],"names":[],"mappings":"AASA,OAAO,EACL,iBAAiB,EACjB,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,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAuCF,eAAO,MAAM,YAAY;;kBAcf,SAAS,sEAEE,MAAM,IAAI,6BACD,MAAM,KAAK,IAAI;wBAuGvB,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/constant.d.ts

@@ -29,10 +29,6 @@ export interface ThirdPartyUserInfo {
     openid: string;
     unionid: string;
 }
-export declare enum LoginState {
-    NOTLOGIN = 0,
-    AUTHORIZED = 1
-}
 export declare enum LoginType {
     LoginTypeApple = 0,
     LoginTypeWeChat = 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,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"}
+{"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,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.22",
+  "version": "0.3.24",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",

package/src/AppleLoginUtil.ts

@@ -1,6 +1,5 @@
 import { appleAuth } from '@invertase/react-native-apple-authentication';
 import { getBundleId } from 'react-native-device-info';
-import { LoginState } from './constant';
 
 const AV = require('leancloud-storage');
 
@@ -12,77 +11,57 @@ export const AppleLoginUtil = {
   //         });
   //     });
 
-  fetchAndUpdateCredentialState: async (
-    user: string,
-    callback: (params: { result: LoginState; error?: string }) => void
-  ) => {
+  fetchAndUpdateCredentialState: async (user: string): Promise<void> => {
     console.log('User 正在登录鉴权：', user);
 
     if (user === null) {
-      callback({ result: LoginState.NOTLOGIN, error: 'USER EMPTY' });
+      throw new Error('USER EMPTY');
+    }
+
+    const credentialState = await appleAuth.getCredentialStateForUser(user);
+    if (credentialState === appleAuth.State.AUTHORIZED) {
+      console.log('登录鉴权成功');
     } else {
-      const credentialState = await appleAuth.getCredentialStateForUser(user);
-      if (credentialState === appleAuth.State.AUTHORIZED) {
-        console.log('登录鉴权成功');
-        callback({ result: LoginState.AUTHORIZED });
-      } else {
-        console.warn('登录鉴权失败');
-        callback({ result: LoginState.NOTLOGIN, error: 'Authorized Failed' });
-      }
+      console.warn('登录鉴权失败');
+      throw new Error('Authorized Failed');
     }
   },
 
-  requestAppleUserForLogin: async () => {
+  requestAppleUserForLogin: async (): Promise<{
+    user: string;
+    email: string | null;
+    identityToken: string | null;
+  }> => {
     if (!appleAuth.isSupported) {
-      return { error: 'Apple Auth Not Supported' };
+      throw new Error('Apple Auth Not Supported');
     }
 
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await appleAuth.performRequest({
-        requestedOperation: appleAuth.Operation.LOGIN,
-        requestedScopes: [appleAuth.Scope.EMAIL, appleAuth.Scope.FULL_NAME],
-      });
+    const appleAuthRequestResponse = await appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGIN,
+      requestedScopes: [appleAuth.Scope.EMAIL, appleAuth.Scope.FULL_NAME],
+    });
 
-      console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
+    console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
 
-      const { user: newUser, email, identityToken } = appleAuthRequestResponse;
+    const { user: newUser, email, identityToken } = appleAuthRequestResponse;
 
-      console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
+    console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
 
-      return { user: newUser, email: email, identityToken: identityToken };
-    } catch (error: any) {
-      if (error.code === 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 };
-      }
-    }
+    return { user: newUser, email, identityToken };
   },
 
   requestAppleUserForLogout: async () => {
     if (!appleAuth.isSupported) {
-      throw { error: 'Apple Auth Not Supported', code: -1 };
+      throw new Error('Apple Auth Not Supported');
     }
 
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await appleAuth.performRequest({
-        requestedOperation: appleAuth.Operation.LOGOUT,
-      });
+    const appleAuthRequestResponse = await appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGOUT,
+    });
 
-      console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
+    console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
 
-      return { authorizationCode: appleAuthRequestResponse.authorizationCode };
-    } catch (error: any) {
-      if (error.code === appleAuth.Error.CANCELED) {
-        throw { error: 'User Cancel Logout', code: error.code };
-      } else {
-        throw { error: 'Logout Request Fail', code: error.code };
-      }
-    }
+    return { authorizationCode: appleAuthRequestResponse.authorizationCode };
   },
 
   requestDeleteAccount: async () => {

package/src/LoginManager.ts

@@ -1,3 +1,4 @@
+import { appleAuth } from '@invertase/react-native-apple-authentication';
 import { getUniqueIdSync } from 'react-native-device-info';
 import { AppleLoginUtil } from './AppleLoginUtil';
 import { Auth } from './Auth';
@@ -8,7 +9,6 @@ import { ToolkitConfig } from './Tool';
 import { WeChatLoginUtil } from './WeChatLoginUtil';
 import {
   LoginAuthDataType,
-  LoginState,
   LoginType,
   LoginUserDataType,
   UserType,
@@ -16,29 +16,35 @@ import {
 
 type FetchImageFunctionType = ({ headimgurl }: { headimgurl: string }) => void;
 export type LoginSuccessResultType = {
-  isAuto?: boolean;
+  isAuto: boolean;
   user: UserType;
 };
 export type LoginFailResultType = {
-  isAuto?: boolean;
-  error: string | object;
-  code?: string;
+  isAuto: boolean;
+  error: unknown;
+  isCancel: boolean;
 };
 
 type LoginFinishParams =
   | { isAuto?: boolean; user: UserType }
-  | { isAuto?: boolean; error: unknown; code?: string };
+  | { isAuto?: boolean; error: unknown; isCancel?: boolean };
 
 const onLoginFinish = (params: LoginFinishParams) => {
   if ('user' in params) {
     const { isAuto = false, user } = params;
     PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
-    const data = { isAuto, user };
+    const data: LoginSuccessResultType = { isAuto, user };
     console.log('onLoginSuccess', data);
     Notification.postNotification('onLoginSuccess', data);
   } else {
-    const { isAuto = false, error, code } = params;
-    const data = { isAuto, error, code };
+    const { isAuto = false, error, isCancel = false } = params;
+    if (__DEV__ && !(error instanceof Error)) {
+      console.error(
+        'onLoginFinish: error should be an Error instance, got:',
+        error
+      );
+    }
+    const data: LoginFailResultType = { isAuto, error, isCancel };
     console.log('onLoginFail', data);
     Notification.postNotification('onLoginFail', data);
   }
@@ -93,32 +99,22 @@ 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: credentialError }) => {
-            if (credentialError || result !== LoginState.AUTHORIZED) {
-              onLoginFinish({ error: credentialError });
-            } else {
-              loadingCallback?.();
-              doLogin(userData.authData, userData);
-            }
-          }
-        );
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        const code =
+          error instanceof Error && 'code' in error
+            ? (error as Error & { code: unknown }).code
+            : undefined;
+        onLoginFinish({ error, isCancel: code === appleAuth.Error.CANCELED });
       }
     } else if (type === LoginType.LoginTypeWeChat) {
       try {
@@ -182,7 +178,7 @@ export const LoginManager = {
         onLoginFinish({ error });
       }
     } else {
-      onLoginFinish({ error: 'Unknown Login Type' });
+      onLoginFinish({ error: new Error('Unknown Login Type') });
     }
   },
 

package/src/constant.ts

@@ -33,11 +33,6 @@ export interface ThirdPartyUserInfo {
   unionid: string;
 }
 
-export enum LoginState {
-  NOTLOGIN,
-  AUTHORIZED,
-}
-
 export enum LoginType {
   LoginTypeApple,
   LoginTypeWeChat,