@norcy/react-native-toolkit 0.3.10 → 0.3.12

package/android/build.gradle

@@ -35,6 +35,7 @@ android {
 }
 
 repositories {
+  maven { url 'https://developer.huawei.com/repo/' }
   mavenCentral()
   google()
 }
@@ -48,4 +49,6 @@ dependencies {
   // 友盟统计
   implementation 'com.umeng.umsdk:common:9.6.3'
   implementation 'com.umeng.umsdk:asms:1.8.0'
+
+  implementation 'com.huawei.hms:hwid:6.11.0.300'
 }

package/android/root.gradle

@@ -1,5 +1,6 @@
 allprojects {
     repositories {
+        maven { url 'https://developer.huawei.com/repo/' }
         maven { url 'https://raw.githubusercontent.com/Norcy/maven/master/repository/' }
         mavenLocal()
         maven {

package/android/src/main/java/com/norcy/reactnativetoolkit/HuaweiLoginModule.java

@@ -0,0 +1,132 @@
+package com.norcy.reactnativetoolkit;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.common.ApiException;
+import com.huawei.hms.support.account.AccountAuthManager;
+import com.huawei.hms.support.account.request.AccountAuthParams;
+import com.huawei.hms.support.account.request.AccountAuthParamsHelper;
+import com.huawei.hms.support.account.result.AuthAccount;
+import com.huawei.hms.support.account.service.AccountAuthService;
+
+public class HuaweiLoginModule extends ReactContextBaseJavaModule implements ActivityEventListener {
+
+    private static final String NAME = "HuaweiLoginModule";
+    private static final int REQUEST_SIGN_IN = 0x8AC1;
+
+    private Promise pendingPromise;
+
+    public HuaweiLoginModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        reactContext.addActivityEventListener(this);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @ReactMethod
+    public void signIn(Promise promise) {
+        Activity activity = getCurrentActivity();
+        if (activity == null) {
+            promise.reject("E_NO_ACTIVITY", "No current activity");
+            return;
+        }
+        if (pendingPromise != null) {
+            promise.reject("E_BUSY", "Huawei sign-in already in progress");
+            return;
+        }
+
+        AccountAuthParams authParams = new AccountAuthParamsHelper(AccountAuthParams.DEFAULT_AUTH_REQUEST_PARAM)
+                .setProfile()
+                .createParams();
+        AccountAuthService service = AccountAuthManager.getService(activity, authParams);
+        Task<AuthAccount> task = service.silentSignIn();
+        task.addOnSuccessListener(account -> resolvePromise(promise, account));
+        task.addOnFailureListener(e -> {
+            pendingPromise = promise;
+            try {
+                activity.startActivityForResult(service.getSignInIntent(), REQUEST_SIGN_IN);
+            } catch (Exception ex) {
+                pendingPromise = null;
+                promise.reject("E_INTENT", ex.getMessage(), ex);
+            }
+        });
+    }
+
+    private void resolvePromise(Promise promise, AuthAccount account) {
+        try {
+            promise.resolve(accountToMap(account));
+        } catch (Exception e) {
+            promise.reject("E_ACCOUNT", e.getMessage(), e);
+        }
+    }
+
+    private WritableMap accountToMap(AuthAccount account) {
+        WritableMap map = Arguments.createMap();
+        map.putString("openid", safe(account.getOpenId()));
+        map.putString("unionid", safe(account.getUnionId()));
+        map.putString("nickname", safe(account.getDisplayName()));
+        map.putString("headimgurl", safe(pickAvatar(account)));
+        return map;
+    }
+
+    private static String pickAvatar(AuthAccount account) {
+        String u = account.getAvatarUriString();
+        return u != null ? u : "";
+    }
+
+    private static String safe(String s) {
+        return s != null ? s : "";
+    }
+
+    @Override
+    public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent intent) {
+        if (requestCode != REQUEST_SIGN_IN || pendingPromise == null) {
+            return;
+        }
+        Promise promise = pendingPromise;
+        pendingPromise = null;
+        if (intent == null) {
+            promise.reject("E_CANCELED", "Huawei sign-in canceled");
+            return;
+        }
+        Task<AuthAccount> authAccountTask = AccountAuthManager.parseAuthResultFromIntent(intent);
+        if (authAccountTask == null) {
+            promise.reject("E_PARSE", "null auth result");
+            return;
+        }
+        if (authAccountTask.isSuccessful()) {
+            AuthAccount account = authAccountTask.getResult();
+            resolvePromise(promise, account);
+            return;
+        }
+        if (resultCode != Activity.RESULT_OK) {
+            promise.reject("E_CANCELED", "Huawei sign-in canceled");
+            return;
+        }
+        Exception ex = authAccountTask.getException();
+        String code = "E_SIGN_IN";
+        if (ex instanceof ApiException) {
+            code = String.valueOf(((ApiException) ex).getStatusCode());
+        }
+        promise.reject(code, ex != null ? ex.getMessage() : "sign in failed", ex);
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+    }
+}

package/android/src/main/java/com/norcy/reactnativetoolkit/ReactNativeToolkitPackage.kt

@@ -15,7 +15,8 @@ class ReactNativeToolkitPackage : ReactPackage {
             ReactNativeToolkitModule(reactContext),
             NCYReport(reactContext),
             NCYAPI(reactContext),
-            CheckPackageInstallationModule(reactContext)
+            CheckPackageInstallationModule(reactContext),
+            HuaweiLoginModule(reactContext)
         )
     }
 
@@ -23,4 +24,3 @@ class ReactNativeToolkitPackage : ReactPackage {
         return emptyList<ViewManager<*, *>>()
     }
 }
-

package/lib/commonjs/HuaweiLoginUtil.js

@@ -9,9 +9,15 @@ var _PlatformHelper = require("./PlatformHelper");
 const HuaweiLoginModule = _reactNative.NativeModules.HuaweiLoginModule ?? _reactNative.TurboModuleRegistry.get('HuaweiLoginModule');
 const HuaweiLoginUtil = exports.HuaweiLoginUtil = {
   doLogin: async callback => {
-    if (!_PlatformHelper.PlatformHelper.isHarmony()) {
+    if (_PlatformHelper.PlatformHelper.isIOS()) {
       callback({
-        error: 'Huawei Login only supports HarmonyOS'
+        error: 'Huawei Login is not supported on iOS'
+      });
+      return;
+    }
+    if (!HuaweiLoginModule || typeof HuaweiLoginModule.signIn !== 'function') {
+      callback({
+        error: 'HuaweiLoginModule not available'
       });
       return;
     }

package/lib/commonjs/HuaweiLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_PlatformHelper","HuaweiLoginModule","NativeModules","TurboModuleRegistry","get","HuaweiLoginUtil","exports","doLogin","callback","PlatformHelper","isHarmony","error","result","signIn","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,MAAME,iBAAiB,GACrBC,0BAAa,CAACD,iBAAiB,IAC/BE,gCAAmB,CAACC,GAAG,CAAM,mBAAmB,CAAC;AAE5C,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BE,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAI,CAACC,8BAAc,CAACC,SAAS,CAAC,CAAC,EAAE;MAC/BF,QAAQ,CAAC;QAAEG,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI;MACF,MAAMC,MAAM,GAAG,MAAMX,iBAAiB,CAACY,MAAM,CAAC,CAAC;MAC/CL,QAAQ,CAAC;QACPM,QAAQ,EAAEF,MAAM,CAACE,QAAQ;QACzBC,UAAU,EAAEH,MAAM,CAACG,UAAU;QAC7BC,MAAM,EAAEJ,MAAM,CAACI,MAAM;QACrBC,OAAO,EAAEL,MAAM,CAACK;MAClB,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVV,QAAQ,CAAC;QAAEG,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_PlatformHelper","HuaweiLoginModule","NativeModules","TurboModuleRegistry","get","HuaweiLoginUtil","exports","doLogin","callback","PlatformHelper","isIOS","error","signIn","result","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,MAAME,iBAAiB,GACrBC,0BAAa,CAACD,iBAAiB,IAC/BE,gCAAmB,CAACC,GAAG,CAAM,mBAAmB,CAAC;AAE5C,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BE,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAIC,8BAAc,CAACC,KAAK,CAAC,CAAC,EAAE;MAC1BF,QAAQ,CAAC;QAAEG,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI,CAACV,iBAAiB,IAAI,OAAOA,iBAAiB,CAACW,MAAM,KAAK,UAAU,EAAE;MACxEJ,QAAQ,CAAC;QAAEG,KAAK,EAAE;MAAkC,CAAC,CAAC;MACtD;IACF;IACA,IAAI;MACF,MAAME,MAAM,GAAG,MAAMZ,iBAAiB,CAACW,MAAM,CAAC,CAAC;MAC/CJ,QAAQ,CAAC;QACPM,QAAQ,EAAED,MAAM,CAACC,QAAQ;QACzBC,UAAU,EAAEF,MAAM,CAACE,UAAU;QAC7BC,MAAM,EAAEH,MAAM,CAACG,MAAM;QACrBC,OAAO,EAAEJ,MAAM,CAACI;MAClB,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVV,QAAQ,CAAC;QAAEG,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}

package/lib/module/HuaweiLoginUtil.js

@@ -5,9 +5,15 @@ import { PlatformHelper } from './PlatformHelper';
 const HuaweiLoginModule = NativeModules.HuaweiLoginModule ?? TurboModuleRegistry.get('HuaweiLoginModule');
 export const HuaweiLoginUtil = {
   doLogin: async callback => {
-    if (!PlatformHelper.isHarmony()) {
+    if (PlatformHelper.isIOS()) {
       callback({
-        error: 'Huawei Login only supports HarmonyOS'
+        error: 'Huawei Login is not supported on iOS'
+      });
+      return;
+    }
+    if (!HuaweiLoginModule || typeof HuaweiLoginModule.signIn !== 'function') {
+      callback({
+        error: 'HuaweiLoginModule not available'
       });
       return;
     }

package/lib/module/HuaweiLoginUtil.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","TurboModuleRegistry","PlatformHelper","HuaweiLoginModule","get","HuaweiLoginUtil","doLogin","callback","isHarmony","error","result","signIn","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,mBAAmB,QAAQ,cAAc;AACjE,SAASC,cAAc,QAAQ,kBAAkB;AAEjD,MAAMC,iBAAiB,GACrBH,aAAa,CAACG,iBAAiB,IAC/BF,mBAAmB,CAACG,GAAG,CAAM,mBAAmB,CAAC;AAEnD,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAI,CAACL,cAAc,CAACM,SAAS,CAAC,CAAC,EAAE;MAC/BD,QAAQ,CAAC;QAAEE,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI;MACF,MAAMC,MAAM,GAAG,MAAMP,iBAAiB,CAACQ,MAAM,CAAC,CAAC;MAC/CJ,QAAQ,CAAC;QACPK,QAAQ,EAAEF,MAAM,CAACE,QAAQ;QACzBC,UAAU,EAAEH,MAAM,CAACG,UAAU;QAC7BC,MAAM,EAAEJ,MAAM,CAACI,MAAM;QACrBC,OAAO,EAAEL,MAAM,CAACK;MAClB,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVT,QAAQ,CAAC;QAAEE,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["NativeModules","TurboModuleRegistry","PlatformHelper","HuaweiLoginModule","get","HuaweiLoginUtil","doLogin","callback","isIOS","error","signIn","result","nickname","headimgurl","openid","unionid","e"],"sourceRoot":"../../src","sources":["HuaweiLoginUtil.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,mBAAmB,QAAQ,cAAc;AACjE,SAASC,cAAc,QAAQ,kBAAkB;AAEjD,MAAMC,iBAAiB,GACrBH,aAAa,CAACG,iBAAiB,IAC/BF,mBAAmB,CAACG,GAAG,CAAM,mBAAmB,CAAC;AAEnD,OAAO,MAAMC,eAAe,GAAG;EAC7BC,OAAO,EAAE,MACPC,QAMU,IACP;IACH,IAAIL,cAAc,CAACM,KAAK,CAAC,CAAC,EAAE;MAC1BD,QAAQ,CAAC;QAAEE,KAAK,EAAE;MAAuC,CAAC,CAAC;MAC3D;IACF;IACA,IAAI,CAACN,iBAAiB,IAAI,OAAOA,iBAAiB,CAACO,MAAM,KAAK,UAAU,EAAE;MACxEH,QAAQ,CAAC;QAAEE,KAAK,EAAE;MAAkC,CAAC,CAAC;MACtD;IACF;IACA,IAAI;MACF,MAAME,MAAM,GAAG,MAAMR,iBAAiB,CAACO,MAAM,CAAC,CAAC;MAC/CH,QAAQ,CAAC;QACPK,QAAQ,EAAED,MAAM,CAACC,QAAQ;QACzBC,UAAU,EAAEF,MAAM,CAACE,UAAU;QAC7BC,MAAM,EAAEH,MAAM,CAACG,MAAM;QACrBC,OAAO,EAAEJ,MAAM,CAACI;MAClB,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,CAAC,EAAE;MACVT,QAAQ,CAAC;QAAEE,KAAK,EAAEO;MAAE,CAAC,CAAC;IACxB;EACF;AACF,CAAC","ignoreList":[]}

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;CAkBb,CAAC"}
+{"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"}

package/package.json

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

package/src/HuaweiLoginUtil.ts

@@ -15,8 +15,12 @@ export const HuaweiLoginUtil = {
       error?: any;
     }) => void
   ) => {
-    if (!PlatformHelper.isHarmony()) {
-      callback({ error: 'Huawei Login only supports HarmonyOS' });
+    if (PlatformHelper.isIOS()) {
+      callback({ error: 'Huawei Login is not supported on iOS' });
+      return;
+    }
+    if (!HuaweiLoginModule || typeof HuaweiLoginModule.signIn !== 'function') {
+      callback({ error: 'HuaweiLoginModule not available' });
       return;
     }
     try {