[firebase_dynamic_links] Add support of expanding from short links (f…

…lutter#1381)
jusst-engineering · Nov 15, 2019 · b522b2b · b522b2b
1 parent 4900968
commit b522b2b
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 13 deletions.
diff --git a/packages/firebase_dynamic_links/CHANGELOG.md b/packages/firebase_dynamic_links/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+7
+
+* Add `getDynamicLink` to support expanding from short links.
+
 ## 0.5.0+6
 
 * Updated README instructions for contributing for consistency with other Flutterfire plugins.

diff --git a/...oid/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java b/...oid/src/main/java/io/flutter/plugins/firebasedynamiclinks/FirebaseDynamicLinksPlugin.java
@@ -92,6 +92,9 @@ public void onMethodCall(MethodCall call, Result result) {
         builder.setLongLink(url);
         buildShortDynamicLink(builder, call, createShortLinkListener(result));
         break;
+      case "FirebaseDynamicLinks#getDynamicLink":
+        handleGetDynamicLink(result, Uri.parse((String) call.argument("url")));
+        break;
       case "FirebaseDynamicLinks#getInitialLink":
         handleGetInitialDynamicLink(result);
         break;
@@ -114,17 +117,8 @@ private Map<String, Object> getMapFromPendingDynamicLinkData(
     return dynamicLink;
   }
 
-  private void handleGetInitialDynamicLink(final Result result) {
-    // If there's no activity, then there's no initial dynamic link.
-    if (registrar.activity() == null) {
-      result.success(null);
-      return;
-    }
-
-    FirebaseDynamicLinks.getInstance()
-        .getDynamicLink(registrar.activity().getIntent())
-        .addOnSuccessListener(
-            registrar.activity(),
+  private void addDynamicLinkListener(Task<PendingDynamicLinkData> task, final Result result) {
+    task.addOnSuccessListener(
             new OnSuccessListener<PendingDynamicLinkData>() {
               @Override
               public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
@@ -138,7 +132,6 @@ public void onSuccess(PendingDynamicLinkData pendingDynamicLinkData) {
               }
             })
         .addOnFailureListener(
-            registrar.activity(),
             new OnFailureListener() {
               @Override
               public void onFailure(@NonNull Exception e) {
@@ -147,6 +140,22 @@ public void onFailure(@NonNull Exception e) {
             });
   }
 
+  private void handleGetDynamicLink(final Result result, Uri uri) {
+    addDynamicLinkListener(FirebaseDynamicLinks.getInstance().getDynamicLink(uri), result);
+  }
+
+  private void handleGetInitialDynamicLink(final Result result) {
+    // If there's no activity, then there's no initial dynamic link.
+    if (registrar.activity() == null) {
+      result.success(null);
+      return;
+    }
+
+    addDynamicLinkListener(
+        FirebaseDynamicLinks.getInstance().getDynamicLink(registrar.activity().getIntent()),
+        result);
+  }
+
   private OnCompleteListener<ShortDynamicLink> createShortLinkListener(final Result result) {
     return new OnCompleteListener<ShortDynamicLink>() {
       @Override

diff --git a/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/ios/Classes/FirebaseDynamicLinksPlugin.m
@@ -99,6 +99,17 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     } else {
       result(dict);
     }
+  } else if ([@"FirebaseDynamicLinks#getDynamicLink" isEqualToString:call.method]) {
+    NSURL *shortLink = [NSURL URLWithString:call.arguments[@"url"]];
+    FIRDynamicLinkUniversalLinkHandler completion =
+        ^(FIRDynamicLink *_Nullable dynamicLink, NSError *_Nullable error) {
+          if (error) {
+            result(getFlutterError(error));
+          } else {
+            result(getDictionaryFromDynamicLink(dynamicLink));
+          }
+        };
+    [[FIRDynamicLinks dynamicLinks] handleUniversalLink:shortLink completion:completion];
   } else {
     result(FlutterMethodNotImplemented);
   }

diff --git a/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart b/packages/firebase_dynamic_links/lib/src/firebase_dynamic_links.dart
@@ -37,6 +37,13 @@ class FirebaseDynamicLinks {
     return getPendingDynamicLinkDataFromMap(linkData);
   }
 
+  Future<PendingDynamicLinkData> getDynamicLink(Uri url) async {
+    final Map<String, dynamic> linkData = await FirebaseDynamicLinks.channel
+        .invokeMapMethod<String, dynamic>('FirebaseDynamicLinks#getDynamicLink',
+            <String, dynamic>{'url': url.toString()});
+    return getPendingDynamicLinkDataFromMap(linkData);
+  }
+
   PendingDynamicLinkData getPendingDynamicLinkDataFromMap(
       Map<dynamic, dynamic> linkData) {
     if (linkData == null) return null;

diff --git a/packages/firebase_dynamic_links/pubspec.yaml b/packages/firebase_dynamic_links/pubspec.yaml
@@ -1,7 +1,7 @@
 name: firebase_dynamic_links
 description: Flutter plugin for Google Dynamic Links for Firebase, an app solution for creating
   and handling links across multiple platforms.
-version: 0.5.0+6
+version: 0.5.0+7
 
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_dynamic_links

diff --git a/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart b/packages/firebase_dynamic_links/test/firebase_dynamic_links_test.dart
@@ -39,6 +39,10 @@ void main() {
                 'minimumVersion': 'Version 12',
               },
             };
+          case 'FirebaseDynamicLinks#getDynamicLink':
+            return <dynamic, dynamic>{
+              'link': 'https://google.com',
+            };
           default:
             return null;
         }
@@ -65,6 +69,21 @@ void main() {
       ]);
     });
 
+    test('getDynamicLink', () async {
+      final Uri argument = Uri.parse('short-link');
+      final PendingDynamicLinkData data =
+          await FirebaseDynamicLinks.instance.getDynamicLink(argument);
+
+      expect(data.link.host, 'google.com');
+
+      expect(log, <Matcher>[
+        isMethodCall('FirebaseDynamicLinks#getDynamicLink',
+            arguments: <String, dynamic>{
+              'url': argument.toString(),
+            })
+      ]);
+    });
+
     group('$DynamicLinkParameters', () {
       test('shortenUrl', () async {
         final Uri url = Uri.parse('google.com');