@norcy/react-native-toolkit 0.3.29 → 0.3.31

package/src/CloudBaseAuth.ts

@@ -1,36 +1,63 @@
-import cloudbase from '@cloudbase/js-sdk';
 import adapter from '@cloudbase/adapter-rn';
-import { Platform } from 'react-native';
+import cloudbase from '@cloudbase/js-sdk';
 import {
   LoginAuthDataType,
   LoginType,
   LoginUserDataType,
   UserType,
 } from './constant';
+import { SyncPrefData } from './SyncPrefData';
 import { ToolkitConfig } from './Tool';
 
 cloudbase.useAdapters(adapter);
 
-/**
- * CloudBase 自定义登录所需的云函数约定（需部署到 CloudBase 并开启 HTTP 访问服务）：
- *
- * ### loginWithAuthData（通过 ToolkitConfig.CloudBaseAuthUrl HTTP 调用）
- * 请求体: { action, authData: { openid, unionid?, loginType }, userData?: { nickname, headimgurl, email }, source? }
- * 响应体: { ticket: string, user: UserProfile, isNew: boolean }
- * 逻辑: 根据 openid+loginType 查找 user_profile，不存在则创建用户（CreateUser API + user_profile 文档），
- *       用 app.auth().createTicket(uid) 签发 ticket 并连同 user_profile 一起返回。
- *
- * ### destroyUser（已登录态下通过 callFunction 调用，云函数名 "auth"）
- * event: { action: 'destroyUser' }
- * 逻辑: 从 context.auth 获取 uid，删除用户系统记录（DeleteUsers API）及 user_profile 文档。
- */
-
 let app: cloudbase.app.App | null = null;
-let cachedProfile: any = null;
 let authUrl = '';
+const CACHED_PROFILE_KEY = 'CloudBaseAuth_CachedProfile_v1';
+const LOGIN_TYPE_MAP: Record<string, number> = {
+  wechat: LoginType.LoginTypeWeChat,
+  visitor: LoginType.LoginTypeVisitor,
+  huawei: LoginType.LoginTypeHuawei,
+  apple: LoginType.LoginTypeApple,
+};
 
-const ensureInit = () => {
+interface CloudBaseProfile {
+  _id: string;
+  nickname: string;
+  email: string;
+  headimgurl: string;
+  loginType: string;
+  vipType?: string;
+  vipEndTime?: string | number | Date;
+  createdAt?: string | number | Date;
+  attr?: unknown;
+  webdav?: unknown;
+}
+
+interface AuthResponse {
+  ticket: string;
+  user: CloudBaseProfile;
+  isNew?: boolean;
+}
+
+const toLocalUser = (profile: CloudBaseProfile): UserType => {
+  return {
+    id: profile._id,
+    nickname: profile.nickname,
+    email: profile.email,
+    headimgurl: profile.headimgurl,
+    type: LOGIN_TYPE_MAP[profile.loginType],
+    vipType: profile.vipType,
+    vipEndTime: profile.vipEndTime ? new Date(profile.vipEndTime) : undefined,
+    createdAt: profile.createdAt ? new Date(profile.createdAt) : undefined,
+    attr: profile.attr,
+    webdav: profile.webdav,
+  };
+};
+
+const getApp = () => {
   if (app) return app;
+
   const {
     CloudBaseEnv,
     CloudBaseAccessKey,
@@ -42,6 +69,7 @@ const ensureInit = () => {
       'CloudBase config missing. Set CloudBaseEnv / CloudBaseAccessKey / CloudBaseAuthUrl in ToolkitConfig.'
     );
   }
+
   app = cloudbase.init({
     env: CloudBaseEnv,
     region: CloudBaseRegion || 'ap-shanghai',
@@ -52,174 +80,105 @@ const ensureInit = () => {
   return app;
 };
 
-const getLoginTypeNum = (loginType?: string) => {
-  if (loginType === 'wechat') {
-    return LoginType.LoginTypeWeChat;
+const setCachedProfile = (profile?: CloudBaseProfile) => {
+  if (!profile) {
+    SyncPrefData.delete(CACHED_PROFILE_KEY);
+  } else {
+    SyncPrefData.set(CACHED_PROFILE_KEY, JSON.stringify(profile));
   }
-  if (loginType === 'visitor') {
-    return LoginType.LoginTypeVisitor;
-  }
-  if (loginType === 'huawei') {
-    return LoginType.LoginTypeHuawei;
-  }
-  return LoginType.LoginTypeApple;
 };
 
-const profileToLocalUser = (profile: any): UserType => {
-  return {
-    id: profile._id ?? '',
-    nickname: profile.nickname,
-    email: profile.email,
-    headimgurl: profile.headimgurl,
-    type: profile.type ?? getLoginTypeNum(profile.loginType),
-    vipType: profile.vipType,
-    vipEndTime: profile.vipEndTime ? new Date(profile.vipEndTime) : undefined,
-    createdAt: profile.createdAt ? new Date(profile.createdAt) : undefined,
-    attr: profile.attr,
-    webdav: profile.webdav,
-  };
+const getUid = () => {
+  return getApp().auth.hasLoginState()?.user.uid;
+};
+
+const requestAuth = async (body: Record<string, unknown>) => {
+  getApp();
+  const response = await fetch(authUrl, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(body),
+  });
+
+  if (!response.ok) {
+    throw new Error(`CloudBase auth failed: ${response.status}`);
+  }
+
+  return response.json() as Promise<AuthResponse>;
 };
 
 export const CloudBaseAuth = {
-  getCurrentUser: async (): Promise<UserType | null> => {
-    const cbApp = ensureInit();
-    const loginState = cbApp.auth.hasLoginState();
-    if (!loginState) {
-      cachedProfile = null;
+  getLocalUser: async (): Promise<UserType | null> => {
+    const uid = getUid();
+    if (!uid) {
+      setCachedProfile();
       return null;
     }
 
-    if (cachedProfile) {
-      return profileToLocalUser(cachedProfile);
+    const raw = SyncPrefData.getString(CACHED_PROFILE_KEY);
+    const profile = raw ? (JSON.parse(raw) as CloudBaseProfile) : null;
+    if (profile?._id === uid) {
+      return toLocalUser(profile);
     }
 
-    const uid = cbApp.auth.currentUser?.uid ?? loginState.user?.uid;
-    if (!uid) return null;
-
-    try {
-      const db = cbApp.database();
-      const { data } = await db.collection('user-profile').doc(uid).get();
-      if (!data || (Array.isArray(data) && data.length === 0)) return null;
-      cachedProfile = Array.isArray(data) ? data[0] : data;
-      return profileToLocalUser(cachedProfile);
-    } catch (error) {
-      console.log('CloudBase getCurrentUser error', error);
-      return null;
-    }
+    await CloudBaseAuth.logout();
+    return null;
   },
 
-  loginWithAuthData: async (
+  login: async (
     authData: LoginAuthDataType,
     userData?: LoginUserDataType
   ): Promise<UserType> => {
-    console.log('CloudBase 开始登录', userData);
-    const cbApp = ensureInit();
-    const loginType = authData.loginType || 'apple';
-
-    const response = await fetch(authUrl, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        action: 'loginWithAuthData',
-        authData: {
-          openid: authData.openid,
-          unionid: authData.unionid,
-          loginType,
-        },
-        userData: userData
-          ? {
-              nickname: userData.nickname,
-              headimgurl: userData.headimgurl,
-              email: userData.email,
-            }
-          : undefined,
-        source: Platform.OS === 'android' ? 2 : undefined,
-      }),
+    const { ticket, user, isNew } = await requestAuth({
+      action: 'login',
+      authData: {
+        openid: authData.openid,
+        unionid: authData.unionid,
+        loginType: authData.loginType,
+      },
+      userData: userData
+        ? {
+            nickname: userData.nickname,
+            headimgurl: userData.headimgurl,
+            email: userData.email,
+          }
+        : undefined,
     });
 
-    if (!response.ok) {
-      const text = await response.text().catch(() => '');
-      console.log('CloudBase 登录失败', response.status, text);
-      throw new Error(`CloudBase auth request failed: ${response.status}`);
-    }
-
-    const result = await response.json();
-    const { ticket, user, isNew } = result;
-
-    if (!ticket) {
-      console.log('CloudBase 登录失败: no ticket returned');
-      throw new Error('CloudBase auth: server did not return a ticket');
-    }
-
-    if (!user) {
-      console.log('CloudBase 登录失败: no user returned', result);
-      throw new Error('CloudBase auth: server did not return a user profile');
-    }
-
-    const signInResult: any = await cbApp.auth.signInWithCustomTicket(() =>
-      Promise.resolve(ticket)
-    );
-    if (signInResult?.error) {
-      console.log('CloudBase 登录失败', signInResult.error);
-      throw signInResult.error;
-    }
-    console.log('CloudBase 登录成功');
-
-    cachedProfile = user;
-    const localUser = profileToLocalUser(user);
-    localUser.isNew = isNew ?? false;
+    await getApp().auth.signInWithCustomTicket(() => Promise.resolve(ticket));
+    setCachedProfile(user);
+    const localUser = toLocalUser(user);
+    localUser.isNew = isNew;
     return localUser;
   },
 
-  logout: () => {
-    const cbApp = ensureInit();
-    cbApp.auth.signOut().catch((e: any) => {
-      console.log('CloudBase signOut error', e);
-    });
-    cachedProfile = null;
+  logout: async () => {
+    await getApp().auth.signOut();
+    setCachedProfile();
   },
 
   updateUser: async (keys: string[], values: any[]): Promise<UserType> => {
-    const cbApp = ensureInit();
-    const uid = cbApp.auth.currentUser?.uid;
+    const uid = getUid();
     if (!uid) throw new Error('User Not Login Yet');
 
-    const db = cbApp.database();
-    const updateData: Record<string, any> = {};
-    const oldValues: any[] = [];
-
-    for (let i = 0; i < keys.length; i++) {
-      oldValues.push(cachedProfile?.[keys[i]]);
-      updateData[keys[i]] = values[i];
-    }
-
-    try {
-      await db.collection('user-profile').doc(uid).update(updateData);
-      const { data } = await db.collection('user-profile').doc(uid).get();
-      cachedProfile = Array.isArray(data) ? data[0] : data;
-      return profileToLocalUser(cachedProfile);
-    } catch (error) {
-      if (cachedProfile) {
-        for (let i = 0; i < keys.length; i++) {
-          cachedProfile[keys[i]] = oldValues[i];
-        }
-      }
-      throw error;
-    }
+    const { user } = await requestAuth({
+      action: 'updateUser',
+      uid,
+      keys,
+      values,
+    });
+    setCachedProfile(user);
+    return toLocalUser(user);
   },
 
   destroyUser: async () => {
-    const cbApp = ensureInit();
-    const uid = cbApp.auth.currentUser?.uid;
+    const uid = getUid();
     if (!uid) throw new Error('User Not Login Yet');
 
-    console.log('get user success');
-    await cbApp.callFunction({
+    await getApp().callFunction({
       name: 'auth',
       data: { action: 'destroyUser' },
     });
-    console.log('delete user success');
-    await cbApp.auth.signOut();
-    cachedProfile = null;
+    await CloudBaseAuth.logout();
   },
 };

package/src/LeanCloudAuth.ts

@@ -1,5 +1,4 @@
 import { User } from 'leancloud-storage';
-import { Platform } from 'react-native';
 import {
   LoginAuthDataType,
   LoginType,
@@ -38,12 +37,12 @@ const getLoginTypeNum = (loginType?: string) => {
 };
 
 export const LeanCloudAuth = {
-  getCurrentUser: async (): Promise<UserType | null> => {
+  getLocalUser: async (): Promise<UserType | null> => {
     const user = await AV.User.currentAsync();
     return user ? AVUserToLocalUser(user) : null;
   },
 
-  loginWithAuthData: async (
+  login: async (
     authData: LoginAuthDataType,
     userData?: LoginUserDataType
   ): Promise<UserType> => {
@@ -80,9 +79,6 @@ export const LeanCloudAuth = {
       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 注册成功');
@@ -96,8 +92,8 @@ export const LeanCloudAuth = {
     }
   },
 
-  logout: () => {
-    AV.User.logOut();
+  logout: async () => {
+    await AV.User.logOut();
   },
 
   updateUser: async (keys: string[], values: any[]): Promise<UserType> => {

package/src/LoginManager.ts

@@ -55,7 +55,7 @@ const doLogin = async (
   userData?: LoginUserDataType
 ) => {
   try {
-    const user = await Auth.loginWithAuthData(authData, userData);
+    const user = await Auth.login(authData, userData);
     onLoginFinish({ user });
   } catch (error: any) {
     onLoginFinish({ error });
@@ -182,11 +182,16 @@ export const LoginManager = {
     }
   },
 
-  logOut: (callback?: () => void) => {
-    console.log('onLogout');
-    Auth.logOut();
-    callback?.();
-    Notification.postNotification('onLogout');
+  logOut: async (callback?: (error?: unknown) => void) => {
+    try {
+      await Auth.logOut();
+      console.log('onLogout');
+      callback?.();
+      Notification.postNotification('onLogout');
+    } catch (e) {
+      console.error(e);
+      callback?.(e);
+    }
   },
 
   isLogin: () => {