fixes for mobile app uris

bitwarden · Sep 15, 2017 · ea1b584 · ea1b584
1 parent a24ede3
commit ea1b584
Showing 1 changed file with 28 additions and 8 deletions.
diff --git a/src/App/Services/LoginService.cs b/src/App/Services/LoginService.cs
@@ -81,9 +81,7 @@ public async Task<Tuple<IEnumerable<Login>, IEnumerable<Login>>> GetAllAsync(str
 
             Uri uri = null;
             string domainName = null;
-            var androidApp = UriIsAndroidApp(uriString);
-            var iosApp = UriIsiOSApp(uriString);
-            var mobileApp = androidApp || iosApp;
+            var mobileApp = UriIsMobileApp(uriString);
 
             if(!mobileApp &&
                 (!Uri.TryCreate(uriString, UriKind.Absolute, out uri) ||
@@ -92,8 +90,7 @@ public async Task<Tuple<IEnumerable<Login>, IEnumerable<Login>>> GetAllAsync(str
                 return null;
             }
 
-            var mobileAppInfo = androidApp ? InfoFromAndroidAppUri(uriString) :
-                iosApp ? InfoFromiOSAppUri(uriString) : null;
+            var mobileAppInfo = InfoFromMobileAppUri(uriString);
             var mobileAppWebUriString = mobileAppInfo?.Item1;
             var mobileAppSearchTerms = mobileAppInfo?.Item2;
             var eqDomains = (await _settingsService.GetEquivalentDomainsAsync()).Select(d => d.ToArray());
@@ -157,10 +154,14 @@ public async Task<Tuple<IEnumerable<Login>, IEnumerable<Login>>> GetAllAsync(str
                     matchingFuzzyLogins.Add(new Login(login));
                     continue;
                 }
-                else if(!mobileApp && Array.IndexOf(matchingDomainsArray, InfoFromAndroidAppUri(loginUriString)) >= 0)
+                else if(!mobileApp)
                 {
-                    matchingFuzzyLogins.Add(new Login(login));
-                    continue;
+                    var info = InfoFromMobileAppUri(loginUriString);
+                    if(info?.Item1 != null && Array.IndexOf(matchingDomainsArray, info.Item1) >= 0)
+                    {
+                        matchingFuzzyLogins.Add(new Login(login));
+                        continue;
+                    }
                 }
 
                 Uri loginUri;
@@ -341,6 +342,20 @@ public async Task<ApiResult> DeleteAttachmentAsync(Login login, string attachmen
             return response;
         }
 
+        private Tuple<string, string[]> InfoFromMobileAppUri(string mobileAppUriString)
+        {
+            if(UriIsAndroidApp(mobileAppUriString))
+            {
+                return InfoFromAndroidAppUri(mobileAppUriString);
+            }
+            else if(UriIsiOSApp(mobileAppUriString))
+            {
+                return InfoFromiOSAppUri(mobileAppUriString);
+            }
+
+            return null;
+        }
+
         private Tuple<string, string[]> InfoFromAndroidAppUri(string androidAppUriString)
         {
             if(!UriIsAndroidApp(androidAppUriString))
@@ -371,6 +386,11 @@ private Tuple<string, string[]> InfoFromiOSAppUri(string iosAppUriString)
             return new Tuple<string, string[]>(webUri, null);
         }
 
+        private bool UriIsMobileApp(string uriString)
+        {
+            return UriIsAndroidApp(uriString) || UriIsiOSApp(uriString);
+        }
+
         private bool UriIsAndroidApp(string uriString)
         {
             return uriString.StartsWith(Constants.AndroidAppProtocol);