@norcy/react-native-toolkit 0.3.21 → 0.3.23

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

@@ -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":";;;;;;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":["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,102 +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":"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","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/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":[]}

package/lib/module/LoginManager.js

@@ -8,14 +8,13 @@ import { Notification } from './Notification';
 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) {
+import { LoginType } from './constant';
+const onLoginFinish = params => {
+  if ('user' in params) {
+    const {
+      isAuto = false,
+      user
+    } = params;
     PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
     const data = {
       isAuto,
@@ -24,6 +23,14 @@ const onLoginFinish = ({
     console.log('onLoginSuccess', data);
     Notification.postNotification('onLoginSuccess', data);
   } else {
+    const {
+      isAuto = false,
+      error
+    } = params;
+    if (__DEV__ && !(error instanceof Error)) {
+      console.error('onLoginFinish: error should be an Error instance, got:', error);
+    }
+    const code = error instanceof Error && 'code' in error ? String(error.code) : undefined;
     const data = {
       isAuto,
       error,
@@ -84,93 +91,75 @@ 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: error2
-        }) => {
-          if (error || result !== LoginState.AUTHORIZED) {
-            onLoginFinish({
-              error: error2
-            });
-          } else {
-            loadingCallback?.();
-            doLogin(userData.authData, userData);
-          }
+        loadingCallback?.();
+        doLogin(userData.authData, userData);
+      } catch (error) {
+        onLoginFinish({
+          error
         });
       }
     } else if (type === LoginType.LoginTypeWeChat) {
-      WeChatLoginUtil.doLogin(ToolkitConfig.WeiXinId, ToolkitConfig.WeiXinSecret, ({
-        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,34 +173,32 @@ 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'
+        error: new Error('Unknown Login Type')
       });
     }
   },
@@ -266,14 +253,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","LoginType","onLoginFinish","params","isAuto","user","setValue","LastLoginType","type","data","console","log","postNotification","error","__DEV__","Error","code","String","undefined","doLogin","authData","userData","loginWithAuthData","LoginManager","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","LoginTypeApple","email","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","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":[]}