Add public getters for external id and onesignal id

Author: jennantilla

android/src/main/java/com/onesignal/flutter/OneSignalUser.java

@@ -32,6 +32,10 @@ static void registerWith(BinaryMessenger messenger) {
     public void onMethodCall(MethodCall call, Result result) {
         if (call.method.contentEquals("OneSignal#setLanguage"))
             this.setLanguage(call, result);
+        else if (call.method.contentEquals("OneSignal#getOnesignalId"))
+            this.getOnesignalId(call, result);
+        else if (call.method.contentEquals("OneSignal#getExternalId"))
+            this.getExternalId(call, result);
         else if (call.method.contentEquals("OneSignal#addAliases"))
             this.addAliases(call, result);
         else if (call.method.contentEquals("OneSignal#removeAliases"))
@@ -63,6 +67,22 @@ private void setLanguage(MethodCall call, Result result) {
         replySuccess(result, null);
     }
 
+    private void getOnesignalId(MethodCall call, Result result) {
+        String onesignalId = OneSignal.getUser().getOnesignalId();
+        if (onesignalId.isEmpty()) {
+            onesignalId = null;
+        }
+        replySuccess(result, onesignalId);
+    }      
+
+    private void getExternalId(MethodCall call, Result result) {
+        String externalId = OneSignal.getUser().getExternalId();
+        if (externalId.isEmpty()) {
+            externalId = null;
+        }
+        replySuccess(result, externalId);
+    }
+    
     private void addAliases(MethodCall call, Result result) {
         // call.arguments is being casted to a Map<String, Object> so a try-catch with
         //  a ClassCastException will be thrown

example/lib/main.dart

@@ -193,6 +193,11 @@ class _MyAppState extends State<MyApp> {
     OneSignal.Location.setShared(true);
   }
 
+  void _handleGetExternalId() async {
+    var externalId = await OneSignal.User.getExternalId();
+    print('External ID: $externalId');
+  }
+
   void _handleLogin() {
     print("Setting external user ID");
     if (_externalUserId == null) return;
@@ -205,6 +210,11 @@ class _MyAppState extends State<MyApp> {
     OneSignal.User.removeAlias("fb_id");
   }
 
+  void _handleGetOnesignalId() async {
+    var onesignalId = await OneSignal.User.getOnesignalId();
+    print('OneSignal ID: $onesignalId');
+  }
+
   oneSignalInAppMessagingTriggerExamples() async {
     /// Example addTrigger call for IAM
     /// This will add 1 trigger so if there are any IAM satisfying it, it
@@ -365,6 +375,10 @@ class _MyAppState extends State<MyApp> {
                       height: 8.0,
                     )
                   ]),
+                  new TableRow(children: [
+                    new OneSignalButton("Get External User ID",
+                        _handleGetExternalId, !_enableConsentButton)
+                  ]),
                   new TableRow(children: [
                     new OneSignalButton("Set External User ID", _handleLogin,
                         !_enableConsentButton)
@@ -373,6 +387,10 @@ class _MyAppState extends State<MyApp> {
                     new OneSignalButton("Remove External User ID",
                         _handleLogout, !_enableConsentButton)
                   ]),
+                  new TableRow(children: [
+                    new OneSignalButton("Get OneSignal ID",
+                        _handleGetOnesignalId, !_enableConsentButton)
+                  ]),
                   new TableRow(children: [
                     new TextField(
                       textAlign: TextAlign.center,

ios/Classes/OSFlutterUser.m

@@ -47,6 +47,10 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     if ([@"OneSignal#setLanguage" isEqualToString:call.method])
         [self setLanguage:call withResult:result];
+    else if ([@"OneSignal#getOnesignalId" isEqualToString:call.method])
+        [self getOnesignalId:call withResult:result];
+    else if ([@"OneSignal#getExternalId" isEqualToString:call.method])
+        [self getExternalId:call withResult:result];
     else if ([@"OneSignal#addAliases" isEqualToString:call.method])
         [self addAliases:call withResult:result];
     else if ([@"OneSignal#removeAliases" isEqualToString:call.method])
@@ -132,4 +136,11 @@ - (void)removeSms:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     result(nil);
 }
 
+- (void)getOnesignalId:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    result(OneSignal.User.onesignalId);
+}
+
+- (void)getExternalId:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    result(OneSignal.User.externalId);
+}
 @end

lib/src/user.dart

@@ -111,4 +111,18 @@ class OneSignalUser {
   Future<void> removeSms(String smsNumber) async {
     return await _channel.invokeMethod("OneSignal#removeSms", smsNumber);
   }
+
+  /// Returns the nullable External ID for the current user.
+  Future<String?> getExternalId() async {
+    final String? externalId =
+        await _channel.invokeMethod("OneSignal#getExternalId");
+    return externalId;
+  }
+
+  /// Returns the nullable OneSignal ID for the current user.
+  Future<String?> getOnesignalId() async {
+    final String? onesignalId =
+        await _channel.invokeMethod("OneSignal#getOnesignalId");
+    return onesignalId;
+  }
 }