@norcy/react-native-toolkit 0.3.21 → 0.3.23

package/lib/module/WeChatLoginUtil.js

@@ -24,55 +24,30 @@ const createSignature = (WeiXinId, nonceStr, sdkTicket, timestamp) => {
   console.log('wx scan signature', origin, ret);
   return ret;
 };
-const getUserInfo = (WeiXinId, WeiXinSecret, code, callback) => {
-  let accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid=' + WeiXinId + '&secret=' + WeiXinSecret + '&code=' + code + '&grant_type=authorization_code';
-  fetch(accessTokenUrl).then(res => {
-    return res.json();
-  }).then(res => {
-    console.log('wechat get access code success: ', res.access_token);
-    let userInfoUrl = 'https://api.weixin.qq.com/sns/userinfo?access_token=' + res.access_token + '&openid=' + res.openid;
-    fetch(userInfoUrl).then(res2 => {
-      return res2.json();
-    }).then(json => {
-      console.log('wechat get user info success: ', json);
-      callback({
-        nickname: json.nickname,
-        headimgurl: json.headimgurl,
-        openid: json.openid,
-        unionid: json.unionid
-      });
-    }).catch(e => {
-      console.warn('wechat get user info fail ', e);
-      callback({
-        error: e
-      });
-    });
-  }).catch(e => {
-    console.warn('wechat get access code fail ', e);
-    callback({
-      error: e
-    });
-  });
+const getUserInfo = async (WeiXinId, WeiXinSecret, code) => {
+  const accessTokenUrl = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid=' + WeiXinId + '&secret=' + WeiXinSecret + '&code=' + code + '&grant_type=authorization_code';
+  const res = await (await fetch(accessTokenUrl)).json();
+  console.log('wechat get access code success: ', res.access_token);
+  const userInfoUrl = 'https://api.weixin.qq.com/sns/userinfo?access_token=' + res.access_token + '&openid=' + res.openid;
+  const json = await (await fetch(userInfoUrl)).json();
+  console.log('wechat get user info success: ', json);
+  return {
+    nickname: json.nickname,
+    headimgurl: json.headimgurl,
+    openid: json.openid,
+    unionid: json.unionid
+  };
 };
 export const WeChatLoginUtil = {
-  doLogin: (WeiXinId, WeiXinSecret, callback) => {
-    WeChat.sendAuthRequest('snsapi_userinfo').then(ret => {
-      console.log('wechat auth success ', ret);
-      if (!ret?.code) {
-        callback({
-          error: 'Auth code 获取失败'
-        });
-        return;
-      }
-      getUserInfo(WeiXinId, WeiXinSecret, ret?.code, callback);
-    }).catch(e => {
-      console.warn('wechat auth fail ', e);
-      callback({
-        error: e
-      });
-    });
+  doLogin: async (WeiXinId, WeiXinSecret) => {
+    const ret = await WeChat.sendAuthRequest('snsapi_userinfo');
+    console.log('wechat auth success ', ret);
+    if (!ret?.code) {
+      throw new Error('Auth code 获取失败');
+    }
+    return getUserInfo(WeiXinId, WeiXinSecret, ret.code);
   },
-  doLoginByScan: async (WeiXinId, WeiXinSecret, onQRGet, callback) => {
+  doLoginByScan: async (WeiXinId, WeiXinSecret, onQRGet) => {
     const accessToken = await getAccessToken(WeiXinId, WeiXinSecret);
     const ticket = await getSDKTicket(accessToken);
     const nonceStr = Tool.generateObjectId();
@@ -80,17 +55,18 @@ export const WeChatLoginUtil = {
     const signature = createSignature(WeiXinId, nonceStr, ticket, timestamp);
     const qrcodeEmitter = new NativeEventEmitter(NativeModules.WeChat);
     const subscription = qrcodeEmitter.addListener('onAuthGotQrcode', res => onQRGet(res.qrcode));
-    NativeModules.WeChat.authByScan(WeiXinId, nonceStr, timestamp, 'snsapi_userinfo', signature, '', ret => {
-      console.log('scan result', ret);
-      subscription.remove();
-      if (!ret?.authCode) {
-        callback({
-          error: 'Auth code 获取失败'
-        });
-        return;
-      }
-      getUserInfo(WeiXinId, WeiXinSecret, ret?.authCode, callback);
+    const authCode = await new Promise((resolve, reject) => {
+      NativeModules.WeChat.authByScan(WeiXinId, nonceStr, timestamp, 'snsapi_userinfo', signature, '', ret => {
+        console.log('scan result', ret);
+        subscription.remove();
+        if (!ret?.authCode) {
+          reject(new Error('Auth code 获取失败'));
+        } else {
+          resolve(ret.authCode);
+        }
+      });
     });
+    return getUserInfo(WeiXinId, WeiXinSecret, authCode);
   }
 };
 //# sourceMappingURL=WeChatLoginUtil.js.map

package/lib/module/WeChatLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["sha1","NativeEventEmitter","NativeModules","WeChat","Tool","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","console","log","getUserInfo","code","callback","accessTokenUrl","then","userInfoUrl","openid","res2","nickname","headimgurl","unionid","catch","e","warn","error","WeChatLoginUtil","doLogin","sendAuthRequest","doLoginByScan","onQRGet","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","subscription","addListener","qrcode","authByScan","remove","authCode"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sha1","NativeEventEmitter","NativeModules","WeChat","Tool","getAccessToken","WeiXinId","WeiXinSecret","url","response","fetch","res","json","access_token","getSDKTicket","accessToken","ticket","createSignature","nonceStr","sdkTicket","timestamp","origin","ret","console","log","getUserInfo","code","accessTokenUrl","userInfoUrl","openid","nickname","headimgurl","unionid","WeChatLoginUtil","doLogin","sendAuthRequest","Error","doLoginByScan","onQRGet","generateObjectId","String","Math","round","Date","now","signature","qrcodeEmitter","subscription","addListener","qrcode","authCode","Promise","resolve","reject","authByScan","remove"],"sourceRoot":"../../src","sources":["WeChatLoginUtil.ts"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,kBAAkB,EAAEC,aAAa,QAAQ,cAAc;AAChE,OAAO,KAAKC,MAAM,MAAM,yBAAyB;AAEjD,SAASC,IAAI,QAAQ,QAAQ;;AAE7B;AACA,MAAMC,cAAc,GAAG,MAAAA,CAAOC,QAAgB,EAAEC,YAAoB,KAAK;EACvE,IAAIC,GAAG,GACL,6EAA6E,GAC7EF,QAAQ,GACR,UAAU,GACVC,YAAY;EACd,MAAME,QAAQ,GAAG,MAAMC,KAAK,CAACF,GAAG,CAAC;EACjC,MAAMG,GAAG,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;EACjC,OAAOD,GAAG,CAACE,YAAY;AACzB,CAAC;AAED,MAAMC,YAAY,GAAG,MAAOC,WAAmB,IAAK;EAClD,IAAIP,GAAG,GACL,yEAAyE,GACzEO,WAAW;EACb,MAAMN,QAAQ,GAAG,MAAMC,KAAK,CAACF,GAAG,CAAC;EACjC,MAAMG,GAAG,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;EACjC,OAAOD,GAAG,CAACK,MAAM;AACnB,CAAC;AAED,MAAMC,eAAe,GAAGA,CACtBX,QAAgB,EAChBY,QAAgB,EAChBC,SAAiB,EACjBC,SAAiB,KACd;EACH,MAAMC,MAAM,GACV,QAAQ,GACRf,QAAQ,GACR,YAAY,GACZY,QAAQ,GACR,cAAc,GACdC,SAAS,GACT,aAAa,GACbC,SAAS;EACX,MAAME,GAAG,GAAGtB,IAAI,CAACqB,MAAM,CAAC;EACxBE,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAEH,MAAM,EAAEC,GAAG,CAAC;EAC7C,OAAOA,GAAG;AACZ,CAAC;AAED,MAAMG,WAAW,GAAG,MAAAA,CAClBnB,QAAgB,EAChBC,YAAoB,EACpBmB,IAAY,KACoB;EAChC,MAAMC,cAAc,GAClB,0DAA0D,GAC1DrB,QAAQ,GACR,UAAU,GACVC,YAAY,GACZ,QAAQ,GACRmB,IAAI,GACJ,gCAAgC;EAClC,MAAMf,GAAG,GAAG,MAAM,CAAC,MAAMD,KAAK,CAACiB,cAAc,CAAC,EAAEf,IAAI,CAAC,CAAC;EACtDW,OAAO,CAACC,GAAG,CAAC,kCAAkC,EAAEb,GAAG,CAACE,YAAY,CAAC;EAEjE,MAAMe,WAAW,GACf,sDAAsD,GACtDjB,GAAG,CAACE,YAAY,GAChB,UAAU,GACVF,GAAG,CAACkB,MAAM;EACZ,MAAMjB,IAAI,GAAG,MAAM,CAAC,MAAMF,KAAK,CAACkB,WAAW,CAAC,EAAEhB,IAAI,CAAC,CAAC;EACpDW,OAAO,CAACC,GAAG,CAAC,gCAAgC,EAAEZ,IAAI,CAAC;EAEnD,OAAO;IACLkB,QAAQ,EAAElB,IAAI,CAACkB,QAAQ;IACvBC,UAAU,EAAEnB,IAAI,CAACmB,UAAU;IAC3BF,MAAM,EAAEjB,IAAI,CAACiB,MAAM;IACnBG,OAAO,EAAEpB,IAAI,CAACoB;EAChB,CAAC;AACH,CAAC;AAED,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MAAAA,CACP5B,QAAgB,EAChBC,YAAoB,KACY;IAChC,MAAMe,GAAG,GAAG,MAAMnB,MAAM,CAACgC,eAAe,CAAC,iBAAiB,CAAC;IAC3DZ,OAAO,CAACC,GAAG,CAAC,sBAAsB,EAAEF,GAAG,CAAC;IACxC,IAAI,CAACA,GAAG,EAAEI,IAAI,EAAE;MACd,MAAM,IAAIU,KAAK,CAAC,gBAAgB,CAAC;IACnC;IACA,OAAOX,WAAW,CAACnB,QAAQ,EAAEC,YAAY,EAAEe,GAAG,CAACI,IAAI,CAAC;EACtD,CAAC;EAEDW,aAAa,EAAE,MAAAA,CACb/B,QAAgB,EAChBC,YAAoB,EACpB+B,OAAiC,KACD;IAChC,MAAMvB,WAAW,GAAG,MAAMV,cAAc,CAACC,QAAQ,EAAEC,YAAY,CAAC;IAChE,MAAMS,MAAM,GAAG,MAAMF,YAAY,CAACC,WAAW,CAAC;IAC9C,MAAMG,QAAQ,GAAGd,IAAI,CAACmC,gBAAgB,CAAC,CAAC;IACxC,MAAMnB,SAAS,GAAGoB,MAAM,CAACC,IAAI,CAACC,KAAK,CAACC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,MAAMC,SAAS,GAAG5B,eAAe,CAACX,QAAQ,EAAEY,QAAQ,EAAEF,MAAM,EAAEI,SAAS,CAAC;IAExE,MAAM0B,aAAa,GAAG,IAAI7C,kBAAkB,CAACC,aAAa,CAACC,MAAM,CAAC;IAElE,MAAM4C,YAAY,GAAGD,aAAa,CAACE,WAAW,CAAC,iBAAiB,EAAGrC,GAAG,IACpE2B,OAAO,CAAC3B,GAAG,CAACsC,MAAM,CACpB,CAAC;IAED,MAAMC,QAAQ,GAAG,MAAM,IAAIC,OAAO,CAAS,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC9DnD,aAAa,CAACC,MAAM,CAACmD,UAAU,CAC7BhD,QAAQ,EACRY,QAAQ,EACRE,SAAS,EACT,iBAAiB,EACjByB,SAAS,EACT,EAAE,EACDvB,GAAQ,IAAK;QACZC,OAAO,CAACC,GAAG,CAAC,aAAa,EAAEF,GAAG,CAAC;QAC/ByB,YAAY,CAACQ,MAAM,CAAC,CAAC;QACrB,IAAI,CAACjC,GAAG,EAAE4B,QAAQ,EAAE;UAClBG,MAAM,CAAC,IAAIjB,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrC,CAAC,MAAM;UACLgB,OAAO,CAAC9B,GAAG,CAAC4B,QAAQ,CAAC;QACvB;MACF,CACF,CAAC;IACH,CAAC,CAAC;IAEF,OAAOzB,WAAW,CAACnB,QAAQ,EAAEC,YAAY,EAAE2C,QAAQ,CAAC;EACtD;AACF,CAAC","ignoreList":[]}

package/lib/module/constant.js

@@ -1,10 +1,5 @@
 "use strict";
 
-export let LoginState = /*#__PURE__*/function (LoginState) {
-  LoginState[LoginState["NOTLOGIN"] = 0] = "NOTLOGIN";
-  LoginState[LoginState["AUTHORIZED"] = 1] = "AUTHORIZED";
-  return LoginState;
-}({});
 export let LoginType = /*#__PURE__*/function (LoginType) {
   LoginType[LoginType["LoginTypeApple"] = 0] = "LoginTypeApple";
   LoginType[LoginType["LoginTypeWeChat"] = 1] = "LoginTypeWeChat";

package/lib/module/constant.js.map

@@ -1 +1 @@
-{"version":3,"names":["LoginState","LoginType"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;AA4BA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,SAAS,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"],"sourceRoot":"../../src","sources":["constant.ts"],"mappings":";;AAmCA,WAAYA,SAAS,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/typescript/AppleLoginUtil.d.ts

@@ -1,23 +1,9 @@
 export declare const AppleLoginUtil: {
-    fetchAndUpdateCredentialState: (user: string, callback: Function) => Promise<void>;
+    fetchAndUpdateCredentialState: (user: string) => Promise<void>;
     requestAppleUserForLogin: () => Promise<{
-        error: string;
-        user?: undefined;
-        email?: undefined;
-        identityToken?: undefined;
-        code?: undefined;
-    } | {
         user: string;
         email: string | null;
         identityToken: string | null;
-        error?: undefined;
-        code?: undefined;
-    } | {
-        error: string;
-        code: any;
-        user?: undefined;
-        email?: undefined;
-        identityToken?: undefined;
     }>;
     requestAppleUserForLogout: () => Promise<{
         authorizationCode: string | null;

package/lib/typescript/AppleLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppleLoginUtil.d.ts","sourceRoot":"","sources":["../../src/AppleLoginUtil.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc;0CAQmB,MAAM,YAAY,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;CA0FvE,CAAC"}
+{"version":3,"file":"AppleLoginUtil.d.ts","sourceRoot":"","sources":["../../src/AppleLoginUtil.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc;0CAQmB,MAAM,KAAG,QAAQ,IAAI,CAAC;;cAiB1D,MAAM;eACL,MAAM,GAAG,IAAI;uBACL,MAAM,GAAG,IAAI;;;;;;CAmD/B,CAAC"}

package/lib/typescript/HuaweiLoginUtil.d.ts

@@ -1,10 +1,5 @@
+import { ThirdPartyUserInfo } from './constant';
 export declare const HuaweiLoginUtil: {
-    doLogin: (callback: (result: {
-        nickname?: string;
-        headimgurl?: string;
-        openid?: string;
-        unionid?: string;
-        error?: any;
-    }) => void) => Promise<void>;
+    doLogin: () => Promise<ThirdPartyUserInfo>;
 };
 //# sourceMappingURL=HuaweiLoginUtil.d.ts.map

package/lib/typescript/HuaweiLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HuaweiLoginUtil.d.ts","sourceRoot":"","sources":["../../src/HuaweiLoginUtil.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,eAAe;iCAEL;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,KAAK,IAAI;CAsBb,CAAC"}
+{"version":3,"file":"HuaweiLoginUtil.d.ts","sourceRoot":"","sources":["../../src/HuaweiLoginUtil.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAOhD,eAAO,MAAM,eAAe;mBACP,QAAQ,kBAAkB,CAAC;CAe/C,CAAC"}

package/lib/typescript/LoginManager.d.ts

@@ -23,7 +23,7 @@ export declare const LoginManager: {
     deleteUser: (callback: (error?: unknown) => void) => Promise<void>;
     lastLoginType: () => any;
     isRegisterInThisDevice: () => any;
-    fetchWeChatAvatar: (callback: FetchImageFunctionType) => void;
+    fetchWeChatAvatar: (callback: FetchImageFunctionType) => Promise<void>;
     getRegisterDays: () => number;
 };
 export {};

package/lib/typescript/LoginManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoginManager.d.ts","sourceRoot":"","sources":["../../src/LoginManager.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,QAAQ,EACT,MAAM,YAAY,CAAC;AAUpB,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;AAuCF,eAAO,MAAM,YAAY;;kBAcf,SAAS,sEAEE,MAAM,IAAI,6BACD,MAAM,KAAK,IAAI;wBA6IvB,MAAM,IAAI;;;;4BAuBtB,MAAM,EAAE,UACN,GAAG,EAAE,uBACO,OAAO,KAAK,IAAI;sBAapB,MAAM,SAAS,GAAG,uBAAsB,OAAO,KAAK,IAAI;oCAIpC,OAAO,KAAK,IAAI;;;kCAyBxB,sBAAsB;;CAsBrD,CAAC"}
+{"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"}

package/lib/typescript/WeChatLoginUtil.d.ts

@@ -1,5 +1,6 @@
+import { ThirdPartyUserInfo } from './constant';
 export declare const WeChatLoginUtil: {
-    doLogin: (WeiXinId: string, WeiXinSecret: string, callback: Function) => void;
-    doLoginByScan: (WeiXinId: string, WeiXinSecret: string, onQRGet: (qrcode: string) => void, callback: Function) => Promise<void>;
+    doLogin: (WeiXinId: string, WeiXinSecret: string) => Promise<ThirdPartyUserInfo>;
+    doLoginByScan: (WeiXinId: string, WeiXinSecret: string, onQRGet: (qrcode: string) => void) => Promise<ThirdPartyUserInfo>;
 };
 //# sourceMappingURL=WeChatLoginUtil.d.ts.map

package/lib/typescript/WeChatLoginUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeChatLoginUtil.d.ts","sourceRoot":"","sources":["../../src/WeChatLoginUtil.ts"],"names":[],"mappings":"AA+FA,eAAO,MAAM,eAAe;wBACN,MAAM,gBAAgB,MAAM,YAAY,QAAQ;8BAiBxD,MAAM,gBACF,MAAM,oBACF,MAAM,KAAK,IAAI,YACvB,QAAQ;CAgCrB,CAAC"}
+{"version":3,"file":"WeChatLoginUtil.d.ts","sourceRoot":"","sources":["../../src/WeChatLoginUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA4EhD,eAAO,MAAM,eAAe;wBAEd,MAAM,gBACF,MAAM,KACnB,QAAQ,kBAAkB,CAAC;8BAUlB,MAAM,gBACF,MAAM,oBACF,MAAM,KAAK,IAAI,KAChC,QAAQ,kBAAkB,CAAC;CAmC/B,CAAC"}

package/lib/typescript/constant.d.ts

@@ -23,9 +23,11 @@ export interface LoginUserDataType {
     email?: string | null;
     authData: LoginAuthDataType;
 }
-export declare enum LoginState {
-    NOTLOGIN = 0,
-    AUTHORIZED = 1
+export interface ThirdPartyUserInfo {
+    nickname: string;
+    headimgurl: string;
+    openid: string;
+    unionid: string;
 }
 export declare enum LoginType {
     LoginTypeApple = 0,

package/lib/typescript/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,oBAAY,UAAU;IACpB,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAED,oBAAY,SAAS;IACnB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,gBAAgB,IAAA;IAChB,mBAAmB,IAAA;IACnB,eAAe,IAAA;CAChB"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/constant.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,SAAS;IACnB,cAAc,IAAA;IACd,eAAe,IAAA;IACf,gBAAgB,IAAA;IAChB,mBAAmB,IAAA;IACnB,eAAe,IAAA;CAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",

package/src/AppleLoginUtil.ts

@@ -1,6 +1,5 @@
 import { appleAuth } from '@invertase/react-native-apple-authentication';
 import { getBundleId } from 'react-native-device-info';
-import { LoginState } from './constant';
 
 const AV = require('leancloud-storage');
 
@@ -12,77 +11,57 @@ export const AppleLoginUtil = {
   //         });
   //     });
 
-  fetchAndUpdateCredentialState: async (user: string, callback: Function) => {
+  fetchAndUpdateCredentialState: async (user: string): Promise<void> => {
     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 () => {
+  requestAppleUserForLogin: async (): Promise<{
+    user: string;
+    email: string | null;
+    identityToken: string | null;
+  }> => {
     if (!appleAuth.isSupported) {
-      return { error: 'Apple Auth Not Supported' };
+      throw new 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],
-      });
+    const appleAuthRequestResponse = await appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGIN,
+      requestedScopes: [appleAuth.Scope.EMAIL, appleAuth.Scope.FULL_NAME],
+    });
 
-      console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
+    console.log('appleAuthRequestResponse login', appleAuthRequestResponse);
 
-      const { user: newUser, email, identityToken } = appleAuthRequestResponse;
+    const { user: newUser, email, identityToken } = appleAuthRequestResponse;
 
-      console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
+    console.log(`Apple Authentication Completed, ${newUser}, ${email}`);
 
-      return { user: newUser, email: email, identityToken: identityToken };
-    } catch (error: any) {
-      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 };
-      }
-    }
+    return { user: newUser, email, identityToken };
   },
 
   requestAppleUserForLogout: async () => {
     if (!appleAuth.isSupported) {
-      throw { error: 'Apple Auth Not Supported', code: -1 };
+      throw new Error('Apple Auth Not Supported');
     }
 
-    // start a login request
-    try {
-      const appleAuthRequestResponse = await appleAuth.performRequest({
-        requestedOperation: appleAuth.Operation.LOGOUT,
-      });
+    const appleAuthRequestResponse = await appleAuth.performRequest({
+      requestedOperation: appleAuth.Operation.LOGOUT,
+    });
 
-      console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
+    console.log('appleAuthRequestResponse logout', appleAuthRequestResponse);
 
-      return { authorizationCode: appleAuthRequestResponse.authorizationCode };
-    } catch (error: any) {
-      if (error.code === appleAuth.Error.CANCELED) {
-        throw { error: 'User Cancel Logout', code: error.code };
-      } else {
-        throw { error: 'Logout Request Fail', code: error.code };
-      }
-    }
+    return { authorizationCode: appleAuthRequestResponse.authorizationCode };
   },
 
   requestDeleteAccount: async () => {

package/src/HuaweiLoginUtil.ts

@@ -1,4 +1,5 @@
 import { NativeModules, TurboModuleRegistry } from 'react-native';
+import { ThirdPartyUserInfo } from './constant';
 import { PlatformHelper } from './PlatformHelper';
 
 const HuaweiLoginModule =
@@ -6,33 +7,19 @@ const HuaweiLoginModule =
   TurboModuleRegistry.get<any>('HuaweiLoginModule');
 
 export const HuaweiLoginUtil = {
-  doLogin: async (
-    callback: (result: {
-      nickname?: string;
-      headimgurl?: string;
-      openid?: string;
-      unionid?: string;
-      error?: any;
-    }) => void
-  ) => {
+  doLogin: async (): Promise<ThirdPartyUserInfo> => {
     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,
+    };
   },
 };