@norcy/react-native-toolkit 0.3.23 → 0.3.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/commonjs/LoginManager.js +7 -4
  2. package/lib/commonjs/LoginManager.js.map +1 -1
  3. package/lib/module/LoginManager.js +7 -4
  4. package/lib/module/LoginManager.js.map +1 -1
  5. package/lib/typescript/LoginManager.d.ts +4 -4
  6. package/lib/typescript/LoginManager.d.ts.map +1 -1
  7. package/package.json +1 -1
  8. package/src/LoginManager.ts +19 -16
package/lib/commonjs/LoginManager.js CHANGED
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.LoginManager = void 0;
7
+ var _reactNativeAppleAuthentication = require("@invertase/react-native-apple-authentication");
7
8
  var _reactNativeDeviceInfo = require("react-native-device-info");
8
9
  var _AppleLoginUtil = require("./AppleLoginUtil");
9
10
  var _Auth = require("./Auth");
@@ -29,16 +30,16 @@ const onLoginFinish = params => {
29
30
  } else {
30
31
  const {
31
32
  isAuto = false,
32
- error
33
+ error,
34
+ isCancel = false
33
35
  } = params;
34
36
  if (__DEV__ && !(error instanceof Error)) {
35
37
  console.error('onLoginFinish: error should be an Error instance, got:', error);
36
38
  }
37
- const code = error instanceof Error && 'code' in error ? String(error.code) : undefined;
38
39
  const data = {
39
40
  isAuto,
40
41
  error,
41
- code
42
+ isCancel
42
43
  };
43
44
  console.log('onLoginFail', data);
44
45
  _Notification.Notification.postNotification('onLoginFail', data);
@@ -112,8 +113,10 @@ const LoginManager = exports.LoginManager = {
112
113
  loadingCallback?.();
113
114
  doLogin(userData.authData, userData);
114
115
  } catch (error) {
116
+ const code = error instanceof Error && 'code' in error ? error.code : undefined;
115
117
  onLoginFinish({
116
- error
118
+ error,
119
+ isCancel: code === _reactNativeAppleAuthentication.appleAuth.Error.CANCELED
117
120
  });
118
121
  }
119
122
  } else if (type === _constant.LoginType.LoginTypeWeChat) {
package/lib/commonjs/LoginManager.js.map CHANGED
@@ -1 +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","__DEV__","Error","code","String","undefined","doLogin","authData","userData","Auth","loginWithAuthData","LoginManager","exports","autoLogin","login","devAuthData","loadingCallback","qrcodeCallback","_","LoginType","LoginTypeApple","email","AppleLoginUtil","requestAppleUserForLogin","fetchAndUpdateCredentialState","userId","openid","loginType","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":[]}
1
+ {"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/module/LoginManager.js CHANGED
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
 
3
+ import { appleAuth } from '@invertase/react-native-apple-authentication';
3
4
  import { getUniqueIdSync } from 'react-native-device-info';
4
5
  import { AppleLoginUtil } from './AppleLoginUtil';
5
6
  import { Auth } from './Auth';
@@ -25,16 +26,16 @@ const onLoginFinish = params => {
25
26
  } else {
26
27
  const {
27
28
  isAuto = false,
28
- error
29
+ error,
30
+ isCancel = false
29
31
  } = params;
30
32
  if (__DEV__ && !(error instanceof Error)) {
31
33
  console.error('onLoginFinish: error should be an Error instance, got:', error);
32
34
  }
33
- const code = error instanceof Error && 'code' in error ? String(error.code) : undefined;
34
35
  const data = {
35
36
  isAuto,
36
37
  error,
37
- code
38
+ isCancel
38
39
  };
39
40
  console.log('onLoginFail', data);
40
41
  Notification.postNotification('onLoginFail', data);
@@ -108,8 +109,10 @@ export const LoginManager = {
108
109
  loadingCallback?.();
109
110
  doLogin(userData.authData, userData);
110
111
  } catch (error) {
112
+ const code = error instanceof Error && 'code' in error ? error.code : undefined;
111
113
  onLoginFinish({
112
- error
114
+ error,
115
+ isCancel: code === appleAuth.Error.CANCELED
113
116
  });
114
117
  }
115
118
  } else if (type === LoginType.LoginTypeWeChat) {
package/lib/module/LoginManager.js.map CHANGED
@@ -1 +1 @@
1
- {"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":[]}
1
+ {"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/typescript/LoginManager.d.ts CHANGED
@@ -3,13 +3,13 @@ type FetchImageFunctionType = ({ headimgurl }: {
3
3
  headimgurl: string;
4
4
  }) => void;
5
5
  export type LoginSuccessResultType = {
6
- isAuto?: boolean;
6
+ isAuto: boolean;
7
7
  user: UserType;
8
8
  };
9
9
  export type LoginFailResultType = {
10
- isAuto?: boolean;
11
- error: string | object;
12
- code?: string;
10
+ isAuto: boolean;
11
+ error: unknown;
12
+ isCancel: boolean;
13
13
  };
14
14
  export declare const LoginManager: {
15
15
  autoLogin: () => Promise<void>;
package/lib/typescript/LoginManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LoginManager.d.ts","sourceRoot":"","sources":["../../src/LoginManager.ts"],"names":[],"mappings":"AAQA,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,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;AAwCF,eAAO,MAAM,YAAY;;kBAcf,SAAS,sEAEE,MAAM,IAAI,6BACD,MAAM,KAAK,IAAI;wBAoGvB,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"}
1
+ {"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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@norcy/react-native-toolkit",
3
- "version": "0.3.23",
3
+ "version": "0.3.24",
4
4
  "private": false,
5
5
  "description": "My Toolkit",
6
6
  "main": "lib/commonjs/index",
package/src/LoginManager.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { appleAuth } from '@invertase/react-native-apple-authentication';
1
2
  import { getUniqueIdSync } from 'react-native-device-info';
2
3
  import { AppleLoginUtil } from './AppleLoginUtil';
3
4
  import { Auth } from './Auth';
@@ -15,36 +16,35 @@ import {
15
16
 
16
17
  type FetchImageFunctionType = ({ headimgurl }: { headimgurl: string }) => void;
17
18
  export type LoginSuccessResultType = {
18
- isAuto?: boolean;
19
+ isAuto: boolean;
19
20
  user: UserType;
20
21
  };
21
22
  export type LoginFailResultType = {
22
- isAuto?: boolean;
23
- error: string | object;
24
- code?: string;
23
+ isAuto: boolean;
24
+ error: unknown;
25
+ isCancel: boolean;
25
26
  };
26
27
 
27
28
  type LoginFinishParams =
28
29
  | { isAuto?: boolean; user: UserType }
29
- | { isAuto?: boolean; error: unknown };
30
+ | { isAuto?: boolean; error: unknown; isCancel?: boolean };
30
31
 
31
32
  const onLoginFinish = (params: LoginFinishParams) => {
32
33
  if ('user' in params) {
33
34
  const { isAuto = false, user } = params;
34
35
  PrefData.setValue(BuildInPrefs.LastLoginType, user.type);
35
- const data = { isAuto, user };
36
+ const data: LoginSuccessResultType = { isAuto, user };
36
37
  console.log('onLoginSuccess', data);
37
38
  Notification.postNotification('onLoginSuccess', data);
38
39
  } else {
39
- const { isAuto = false, error } = params;
40
+ const { isAuto = false, error, isCancel = false } = params;
40
41
  if (__DEV__ && !(error instanceof Error)) {
41
- console.error('onLoginFinish: error should be an Error instance, got:', error);
42
+ console.error(
43
+ 'onLoginFinish: error should be an Error instance, got:',
44
+ error
45
+ );
42
46
  }
43
- const code =
44
- error instanceof Error && 'code' in error
45
- ? String((error as Error & { code: unknown }).code)
46
- : undefined;
47
- const data = { isAuto, error, code };
47
+ const data: LoginFailResultType = { isAuto, error, isCancel };
48
48
  console.log('onLoginFail', data);
49
49
  Notification.postNotification('onLoginFail', data);
50
50
  }
@@ -100,8 +100,7 @@ export const LoginManager = {
100
100
 
101
101
  if (type === LoginType.LoginTypeApple) {
102
102
  try {
103
- const { user, email } =
104
- await AppleLoginUtil.requestAppleUserForLogin();
103
+ const { user, email } = await AppleLoginUtil.requestAppleUserForLogin();
105
104
  await AppleLoginUtil.fetchAndUpdateCredentialState(user);
106
105
  let userData = {
107
106
  userId: user,
@@ -111,7 +110,11 @@ export const LoginManager = {
111
110
  loadingCallback?.();
112
111
  doLogin(userData.authData, userData);
113
112
  } catch (error) {
114
- onLoginFinish({ error });
113
+ const code =
114
+ error instanceof Error && 'code' in error
115
+ ? (error as Error & { code: unknown }).code
116
+ : undefined;
117
+ onLoginFinish({ error, isCancel: code === appleAuth.Error.CANCELED });
115
118
  }
116
119
  } else if (type === LoginType.LoginTypeWeChat) {
117
120
  try {