@norcy/react-native-toolkit 0.1.136 → 0.1.138

package/src/ConfigDataModel.ts

@@ -1,6 +1,6 @@
 import { Object } from 'leancloud-storage';
 import { Platform } from 'react-native';
-import { LoginManager, LoginResultDataType } from './LoginManager';
+import { LoginManager, LoginSuccessResultType } from './LoginManager';
 import { Notification } from './Notification';
 import { VersionManager } from './VersionManager';
 import { VipAndroidManager } from './VipAndroidManager';
@@ -75,9 +75,9 @@ const ConfigDataModel = {
     MyItems = defaultValues;
 
     Notification.addListener(
-      'onLogin',
-      ({ isAuto, user, error }: LoginResultDataType) => {
-        if (!isAuto && user && !error) {
+      'onLoginSuccess',
+      ({ isAuto }: LoginSuccessResultType) => {
+        if (!isAuto) {
           isDataReady = false;
           isNetwordDataReady = false;
           ConfigDataModel.fetch();

package/src/LoginManager.ts

@@ -15,7 +15,17 @@ import {
 } from './constant';
 
 type FetchImageFunctionType = ({ headimgurl }: { headimgurl: string }) => void;
-export type LoginResultDataType = {
+export type LoginSuccessResultType = {
+  isAuto?: boolean;
+  user: UserType;
+};
+export type LoginFailResulType = {
+  isAuto?: boolean;
+  error: string | object;
+  code?: string;
+};
+
+type LoginFinishParams = {
   isAuto?: boolean;
   user?: UserType;
   error?: string | object;
@@ -41,12 +51,15 @@ const onLoginFinish = ({
   user,
   error,
   code,
-}: LoginResultDataType) => {
-  const data = { isAuto, user, error, code };
+}: LoginFinishParams) => {
   if (user) {
     PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
+    const data = { isAuto, user };
+    Notification.postNotification('onLoginSuccess', data);
+  } else {
+    const data = { isAuto, error, code };
+    Notification.postNotification('onLoginFail', data);
   }
-  Notification.postNotification('onLogin', data);
 };
 
 const doLeanCloudLogin = async (

package/src/MessageModel.ts

@@ -2,7 +2,7 @@ import { Object } from 'leancloud-storage';
 import { Platform } from 'react-native';
 import { ConfigDataModel } from './ConfigDataModel';
 import { FreConfigType, FrequenceManager } from './Frequence';
-import { LoginManager, LoginResultDataType } from './LoginManager';
+import { LoginManager, LoginSuccessResultType } from './LoginManager';
 import { Notification } from './Notification';
 import { BuildInPrefs, PrefData } from './PrefData';
 import { Tool } from './Tool';
@@ -147,9 +147,9 @@ export const MessageModel = {
     });
 
     Notification.addListener(
-      'onLogin',
-      ({ isAuto, user, error }: LoginResultDataType) => {
-        if (!isAuto && user && !error) {
+      'onLoginSuccess',
+      ({ isAuto }: LoginSuccessResultType) => {
+        if (!isAuto) {
           isDataReady = false;
           isConfigStateReady = false;
           isNetwordDataReady = false;

package/src/ReportUtil.ts

@@ -5,7 +5,7 @@ import {
   getModel,
   getReadableVersion,
 } from 'react-native-device-info';
-import { LoginResultDataType } from './LoginManager';
+import { LoginSuccessResultType } from './LoginManager';
 import { Notification } from './Notification';
 
 export interface ReportItemType {
@@ -69,14 +69,12 @@ export const ReportUtil = {
     }
 
     Notification.addListener(
-      'onLogin',
-      ({ error, user }: LoginResultDataType) => {
-        if (!error && user) {
-          if (!__DEV__) {
-            NativeModules.NCYReport.signIn(user.AVUser.get('objectId'));
-          }
-          ReportUtil.setCommonInfo('user', user.AVUser.get('objectId'));
+      'onLoginSuccess',
+      ({ user }: LoginSuccessResultType) => {
+        if (!__DEV__) {
+          NativeModules.NCYReport.signIn(user.AVUser.get('objectId'));
         }
+        ReportUtil.setCommonInfo('user', user.AVUser.get('objectId'));
       }
     );
 

package/src/SentryManager.ts

@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/react-native';
-import { LoginResultDataType } from './LoginManager';
+import { LoginSuccessResultType } from './LoginManager';
 import { Notification } from './Notification';
 import { ToolkitConfig } from './Tool';
 
@@ -18,16 +18,14 @@ export const SentryManager = {
       });
 
       Notification.addListener(
-        'onLogin',
-        ({ error, user }: LoginResultDataType) => {
-          if (!error && user) {
-            const sentryUser: Sentry.User = {
-              id: user.AVUser.get('objectId'),
-              email: user.email,
-              username: user.nickname,
-            };
-            Sentry.setUser(sentryUser);
-          }
+        'onLoginSuccess',
+        ({ user }: LoginSuccessResultType) => {
+          const sentryUser: Sentry.User = {
+            id: user.AVUser.get('objectId'),
+            email: user.email,
+            username: user.nickname,
+          };
+          Sentry.setUser(sentryUser);
         }
       );
 

package/src/VipManager.ts

@@ -4,7 +4,7 @@ import Purchases, {
   PurchasesPackage,
 } from 'react-native-purchases';
 import { DevConfig } from './DevConfig';
-import { LoginManager, LoginResultDataType } from './LoginManager';
+import { LoginManager, LoginSuccessResultType } from './LoginManager';
 import { Notification } from './Notification';
 import { BuildInPrefs } from './PrefData';
 import { Tool, ToolkitConfig } from './Tool';
@@ -50,12 +50,10 @@ export const VipManager = {
     }
 
     Notification.addListener(
-      'onLogin',
-      async ({ error, user }: LoginResultDataType) => {
+      'onLoginSuccess',
+      async ({ user }: LoginSuccessResultType) => {
         console.log('Vip 模块用户登录 from 监听');
-        if (!error && user) {
-          onLogin(user);
-        }
+        onLogin(user);
       }
     );