@norcy/react-native-toolkit 0.3.17 → 0.3.19

package/src/Auth.ts

@@ -0,0 +1,61 @@
+import { LoginAuthDataType, LoginUserDataType, UserType } from './constant';
+import { LeanCloudAuth } from './LeanCloudAuth';
+import { BuildInPrefs, PrefData } from './PrefData';
+
+type AuthBackend = 'leancloud' | 'cloudbase';
+
+// 唯一后端切换开关：后续接入 CloudBase 仅需改这里。
+const AUTH_BACKEND = 'leancloud' as AuthBackend;
+
+const backend = (() => {
+  if (AUTH_BACKEND === 'cloudbase') {
+    throw new Error('CloudBase auth is not implemented yet');
+  }
+  return LeanCloudAuth;
+})();
+
+let CURRENT_USER: UserType | null = null;
+
+export const Auth = {
+  autoLogin: async (): Promise<UserType> => {
+    const user = await backend.getCurrentUser();
+    if (!user) {
+      throw new Error('User Not Login Yet');
+    }
+    CURRENT_USER = user;
+    return user;
+  },
+
+  loginWithAuthData: async (
+    authData: LoginAuthDataType,
+    userData?: LoginUserDataType
+  ): Promise<UserType> => {
+    const user = await backend.loginWithAuthData(authData, userData);
+    if (user.isNew) {
+      // 标记为当前用户是在本机注册的 TODO
+      PrefData.setValue(BuildInPrefs.RegisterInThisDevice, true);
+    }
+    CURRENT_USER = user;
+    return user;
+  },
+
+  logOut: () => {
+    backend.logout();
+    CURRENT_USER = null;
+  },
+
+  currentUser: (): UserType | null => {
+    return CURRENT_USER;
+  },
+
+  batchUpdateUser: async (keys: string[], values: any[]): Promise<UserType> => {
+    const user = await backend.updateUser(keys, values);
+    CURRENT_USER = user;
+    return user;
+  },
+
+  deleteUser: async (): Promise<void> => {
+    await backend.destroyUser();
+    CURRENT_USER = null;
+  },
+};

package/src/LeanCloudAuth.ts

@@ -0,0 +1,133 @@
+import { User } from 'leancloud-storage';
+import { Platform } from 'react-native';
+import {
+  LoginAuthDataType,
+  LoginType,
+  LoginUserDataType,
+  UserType,
+} from './constant';
+
+const AV = require('leancloud-storage');
+
+const AVUserToLocalUser = (user: User): UserType => {
+  return {
+    id: user.get('objectId') ?? user.id ?? '',
+    nickname: user.get('nickname'),
+    email: user.get('email'),
+    headimgurl: user.get('headimgurl'),
+    type: user.get('type'),
+    vipType: user.get('vipType'),
+    vipEndTime: user.get('vipEndTime'),
+    createdAt: user.getCreatedAt(),
+    attr: user.get('attr'),
+    webdav: user.get('webdav'),
+  };
+};
+
+const getLoginTypeNum = (loginType?: string) => {
+  if (loginType === 'wechat') {
+    return LoginType.LoginTypeWeChat;
+  }
+  if (loginType === 'visitor') {
+    return LoginType.LoginTypeVisitor;
+  }
+  if (loginType === 'huawei') {
+    return LoginType.LoginTypeHuawei;
+  }
+  return LoginType.LoginTypeApple;
+};
+
+export const LeanCloudAuth = {
+  getCurrentUser: async (): Promise<UserType | null> => {
+    const user = await AV.User.currentAsync();
+    return user ? AVUserToLocalUser(user) : null;
+  },
+
+  loginWithAuthData: async (
+    authData: LoginAuthDataType,
+    userData?: LoginUserDataType
+  ): Promise<UserType> => {
+    console.log('Lean Cloud 开始登录', userData);
+    // loginType 空说明是老用户
+    const loginType = authData.loginType || 'apple';
+
+    try {
+      const user: User = await AV.User.loginWithAuthData(authData, loginType, {
+        failOnNotExist: true,
+      });
+      console.log('Lean Cloud 登录成功');
+      // 每次重新鉴权都更新头像和昵称，避免微信头像过期
+      // if (userData?.nickname) {
+      //   user.set('nickname', userData?.nickname);
+      // }
+      // if (userData?.headimgurl) {
+      //   user.set('headimgurl', userData?.headimgurl);
+      // }
+      // user.save();
+      return AVUserToLocalUser(user);
+    } catch (error: any) {
+      if (error.code !== 211) {
+        console.log('Lean Cloud 登录失败', error);
+        throw error;
+      }
+
+      // 创建用户，并补充资料
+      console.log('创建用户，并补充资料');
+      const newUser = new AV.User();
+      if (userData?.email) {
+        newUser.setEmail(userData.email);
+      }
+      newUser.set('nickname', userData?.nickname);
+      newUser.set('headimgurl', userData?.headimgurl);
+      newUser.set('type', getLoginTypeNum(loginType));
+      if (Platform.OS === 'android') {
+        newUser.set('source', 2);
+      }
+      try {
+        const user: User = await newUser.loginWithAuthData(authData, loginType);
+        console.log('Lean Cloud 注册成功');
+        const localUser = AVUserToLocalUser(user);
+        localUser.isNew = true;
+        return localUser;
+      } catch (error2) {
+        console.log('Lean Cloud 登录失败', error2);
+        throw error2;
+      }
+    }
+  },
+
+  logout: () => {
+    AV.User.logOut();
+  },
+
+  updateUser: async (keys: string[], values: any[]): Promise<UserType> => {
+    const user = await AV.User.currentAsync();
+    if (!user) {
+      throw new Error('User Not Login Yet');
+    }
+    const oldValues: any[] = [];
+    for (let i = 0; i < keys.length; i++) {
+      oldValues.push(user.get(keys[i]));
+      user.set(keys[i], values[i]);
+    }
+    try {
+      const newUser = await user.save();
+      return AVUserToLocalUser(newUser);
+    } catch (error) {
+      for (let i = 0; i < keys.length; i++) {
+        user.set(keys[i], oldValues[i]);
+      }
+      throw error;
+    }
+  },
+
+  destroyUser: async () => {
+    const user = await AV.User.currentAsync();
+    if (!user) {
+      throw new Error('User Not Login Yet');
+    }
+    console.log('get user success');
+    await user.destroy();
+    console.log('delete user success');
+  },
+};

package/src/LoginManager.ts

@@ -1,7 +1,6 @@
-import { User } from 'leancloud-storage';
-import { Platform } from 'react-native';
 import { getUniqueIdSync } from 'react-native-device-info';
 import { AppleLoginUtil } from './AppleLoginUtil';
+import { Auth } from './Auth';
 import { HuaweiLoginUtil } from './HuaweiLoginUtil';
 import { Notification } from './Notification';
 import { BuildInPrefs, PrefData } from './PrefData';
@@ -33,25 +32,6 @@ type LoginFinishParams = {
   code?: string;
 };
 
-const AV = require('leancloud-storage');
-
-let CURRENT_USER: UserType | null = null;
-
-const AVUserToLocalUser = (user: User) => {
-  return {
-    id: user.get('objectId') ?? user.id ?? '',
-    nickname: user.get('nickname'),
-    email: user.get('email'),
-    headimgurl: user.get('headimgurl'),
-    type: user.get('type'),
-    vipType: user.get('vipType'),
-    vipEndTime: user.get('vipEndTime'),
-    createdAt: user.getCreatedAt(),
-    attr: user.get('attr'),
-    webdav: user.get('webdav'),
-  };
-};
-
 const onLoginFinish = ({
   isAuto = false,
   user,
@@ -70,88 +50,27 @@ const onLoginFinish = ({
   }
 };
 
-const doLeanCloudLogin = async (
+const doLogin = async (
   authData: LoginAuthDataType,
-  userData: LoginUserDataType | undefined,
-  callback: ({ user, error }: { user?: UserType; error?: any }) => void
+  userData?: LoginUserDataType
 ) => {
-  console.log('Lean Cloud 开始登录', userData);
-  // loginType 空说明是老用户
-  const loginType = authData.loginType ? authData.loginType : 'apple';
-  let loginTypeNum = LoginType.LoginTypeApple;
-  if (loginType === 'wechat') {
-    loginTypeNum = LoginType.LoginTypeWeChat;
-  } else if (loginType === 'visitor') {
-    loginTypeNum = LoginType.LoginTypeVisitor;
-  } else if (loginType === 'huawei') {
-    loginTypeNum = LoginType.LoginTypeHuawei;
+  try {
+    const user = await Auth.loginWithAuthData(authData, userData);
+    onLoginFinish({ user });
+  } catch (error: any) {
+    onLoginFinish({ error });
   }
-
-  AV.User.loginWithAuthData(authData, loginType, { failOnNotExist: true }).then(
-    (user: User) => {
-      // 登录成功
-      console.log('Lean Cloud 登录成功');
-      // 每次重新鉴权都更新头像和昵称，避免微信头像过期
-      // if (userData?.nickname) {
-      //   user.set('nickname', userData?.nickname);
-      // }
-      // if (userData?.headimgurl) {
-      //   user.set('headimgurl', userData?.headimgurl);
-      // }
-      // user.save();
-      CURRENT_USER = AVUserToLocalUser(user);
-      callback({ user: CURRENT_USER });
-    },
-    (error: any) => {
-      if (error.code === 211) {
-        // 创建用户，并补充资料
-        console.log('创建用户，并补充资料');
-        const newUser = new AV.User();
-        const email = userData?.email;
-        if (email) {
-          newUser.setEmail(email);
-        }
-        newUser.set('nickname', userData?.nickname);
-        newUser.set('headimgurl', userData?.headimgurl);
-        newUser.set('type', loginTypeNum);
-        if (Platform.OS === 'android') {
-          newUser.set('source', 2);
-        }
-        newUser.loginWithAuthData(authData, loginType).then(
-          (user: User) => {
-            // 登录成功
-            console.log('Lean Cloud 注册成功');
-            CURRENT_USER = AVUserToLocalUser(user);
-            CURRENT_USER.isNew = true;
-            // 标记为当前用户是在本机注册的 TODO
-            PrefData.setValue(BuildInPrefs.RegisterInThisDevice, true);
-            callback({ user: CURRENT_USER });
-          },
-          (error2: any) => {
-            // 登录失败
-            console.log('Lean Cloud 登录失败', error2);
-            callback({ error: error2 });
-          }
-        );
-      } else {
-        // 登录失败
-        console.log('Lean Cloud 登录失败', error);
-        callback({ error: error });
-      }
-    }
-  );
 };
 
 export const LoginManager = {
   // 自动根据已有的 User 信息进行登录鉴权，如果 User 为空则失败
   autoLogin: async () => {
-    const user = await AV.User.currentAsync();
-    if (user) {
+    try {
+      const user = await Auth.autoLogin();
       console.log('自动登录成功');
-      CURRENT_USER = AVUserToLocalUser(user);
-      onLoginFinish({ isAuto: true, user: CURRENT_USER });
-    } else {
-      onLoginFinish({ isAuto: true, error: 'User Not Login Yet' });
+      onLoginFinish({ isAuto: true, user });
+    } catch (error: any) {
+      onLoginFinish({ isAuto: true, error });
     }
   },
 
@@ -163,24 +82,24 @@ export const LoginManager = {
     qrcodeCallback?: (qrcode: string) => void
   ) => {
     // 如果之前已经鉴权过，则直接使用上次鉴权的 AuthData
-    const cuurentUser = await AV.User.currentAsync();
-    if (cuurentUser) {
-      await LoginManager.autoLogin();
+    try {
+      const user = await Auth.autoLogin();
+      onLoginFinish({ isAuto: true, user });
       return;
+    } catch (_) {
+      // 自动登录失败，无需报错，继续正常登录流程
     }
 
     // 改为注入 delegate
     if (__DEV__) {
       if (devAuthData) {
-        doLeanCloudLogin(devAuthData, undefined, ({ user, error }) => {
-          onLoginFinish({ user, error });
-        });
+        await doLogin(devAuthData);
         return;
       }
     }
 
     if (type === LoginType.LoginTypeApple) {
-      const { user, email, identityToken, error, code } =
+      const { user, email, error, code } =
         await AppleLoginUtil.requestAppleUserForLogin();
       if (!user || error) {
         onLoginFinish({ error, code });
@@ -191,8 +110,6 @@ export const LoginManager = {
           email: email,
           authData: {
             openid: user,
-            access_token: identityToken,
-            expires_in: 99999999,
             loginType: 'apple',
           },
         };
@@ -204,13 +121,7 @@ export const LoginManager = {
               onLoginFinish({ error: error2 });
             } else {
               loadingCallback && loadingCallback();
-              doLeanCloudLogin(
-                userData.authData,
-                userData,
-                ({ user: loginUser, error: error3 }) => {
-                  onLoginFinish({ user: loginUser, error: error3 });
-                }
-              );
+              doLogin(userData.authData, userData);
             }
           }
         );
@@ -241,19 +152,11 @@ export const LoginManager = {
               authData: {
                 openid: openid,
                 unionid: unionid,
-                access_token: openid,
-                expires_in: 99999999,
                 loginType: 'wechat',
               },
             };
             loadingCallback && loadingCallback();
-            doLeanCloudLogin(
-              userData.authData,
-              userData,
-              ({ user, error: error2 }) => {
-                onLoginFinish({ user, error: error2 });
-              }
-            );
+            doLogin(userData.authData, userData);
           }
         }
       );
@@ -284,19 +187,11 @@ export const LoginManager = {
               authData: {
                 openid: openid,
                 unionid: unionid,
-                access_token: openid,
-                expires_in: 99999999,
                 loginType: 'wechat',
               },
             };
             loadingCallback && loadingCallback();
-            doLeanCloudLogin(
-              userData.authData,
-              userData,
-              ({ user, error: error2 }) => {
-                onLoginFinish({ user, error: error2 });
-              }
-            );
+            doLogin(userData.authData, userData);
           }
         }
       );
@@ -307,15 +202,11 @@ export const LoginManager = {
         nickname: 'Visitor',
         authData: {
           openid: uniqueId,
-          access_token: uniqueId,
-          expires_in: 99999999,
           loginType: 'visitor',
         },
       };
       loadingCallback && loadingCallback();
-      doLeanCloudLogin(userData.authData, userData, ({ user, error }) => {
-        onLoginFinish({ user, error });
-      });
+      doLogin(userData.authData, userData);
     } else if (type === LoginType.LoginTypeHuawei) {
       HuaweiLoginUtil.doLogin(
         ({ nickname, headimgurl, openid, unionid, error }) => {
@@ -328,19 +219,11 @@ export const LoginManager = {
               authData: {
                 openid: openid!,
                 unionid: unionid,
-                access_token: openid!,
-                expires_in: 99999999,
                 loginType: 'huawei',
               },
             };
             loadingCallback && loadingCallback();
-            doLeanCloudLogin(
-              userData.authData,
-              userData,
-              ({ user, error: error2 }) => {
-                onLoginFinish({ user, error: error2 });
-              }
-            );
+            doLogin(userData.authData, userData);
           }
         }
       );
@@ -351,8 +234,7 @@ export const LoginManager = {
 
   logOut: (callback?: Function) => {
     console.log('onLogout');
-    AV.User.logOut();
-    CURRENT_USER = null;
+    Auth.logOut();
     callback && callback();
     Notification.postNotification('onLogout');
   },
@@ -369,8 +251,7 @@ export const LoginManager = {
   },
 
   currentUser: () => {
-    // console.log('current user is ', CURRENT_USER);
-    return CURRENT_USER;
+    return Auth.currentUser();
   },
 
   batchUpdateUser: async (
@@ -378,26 +259,13 @@ export const LoginManager = {
     values: any[],
     callback?: Function
   ) => {
-    console.log('Batch Update User Begin: ' + keys + ' ' + values);
-    const user = await AV.User.currentAsync();
-    if (!user) {
-      return;
-    }
-    const oldValues = [];
-    for (let i = 0; i < keys.length; i++) {
-      oldValues.push(user.get(keys[i]));
-      user.set(keys[i], values[i]);
-    }
     try {
-      const newUser = await user.save();
-      CURRENT_USER = AVUserToLocalUser(newUser);
+      console.log('Batch Update User Begin: ' + keys + ' ' + values);
+      const user = await Auth.batchUpdateUser(keys, values);
       console.log('Batch Update User End', user);
       callback && callback();
     } catch (e) {
       console.error(e);
-      for (let i = 0; i < keys.length; i++) {
-        user.set(keys[i], oldValues[i]);
-      }
       callback && callback(e);
     }
   },
@@ -408,16 +276,14 @@ export const LoginManager = {
 
   deleteUser: async (callback: Function) => {
     try {
-      if (!CURRENT_USER) {
+      const currentUser = Auth.currentUser();
+      if (!currentUser) {
         return;
       }
-      if (CURRENT_USER.type === LoginType.LoginTypeApple) {
+      if (currentUser.type === LoginType.LoginTypeApple) {
         await AppleLoginUtil.requestDeleteAccount();
       }
-      const user = await AV.User.currentAsync();
-      console.log('get user success');
-      await user.destroy();
-      console.log('delete user success');
+      await Auth.deleteUser();
       callback();
     } catch (error) {
       console.error(error);
@@ -443,7 +309,6 @@ export const LoginManager = {
     );
   },
 
-  // 已注册天数
   getRegisterDays: () => {
     if (!LoginManager.isLogin()) {
       return 0;

package/src/constant.ts

@@ -15,8 +15,6 @@ export interface UserType {
 export interface LoginAuthDataType {
   openid: string;
   unionid?: string;
-  access_token: string | null;
-  expires_in: number;
   loginType: string;
 }