used existing functionality to check if repo is a github repo

Jasmine · Jasmine · commit dc744823ad80 · 2016-06-23T12:10:22.000-04:00
diff --git a/src/GitHub.Exports/Services/IMenuHandler.cs b/src/GitHub.Exports/Services/IMenuHandler.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Threading.Tasks;
 
 namespace GitHub.VisualStudio
 {
diff --git a/src/GitHub.VisualStudio/Base/MenuBase.cs b/src/GitHub.VisualStudio/Base/MenuBase.cs
@@ -3,23 +3,47 @@
 using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.Services;
+using System.Threading.Tasks;
+using GitHub.Api;
+using GitHub.Primitives;
+using NullGuard;
+using System.Diagnostics;
 
 namespace GitHub.VisualStudio
 {
     public abstract class MenuBase
     {
         readonly IServiceProvider serviceProvider;
+        readonly ISimpleApiClientFactory apiFactory;
+
         protected IServiceProvider ServiceProvider { get { return serviceProvider; } }
 
         protected ISimpleRepositoryModel ActiveRepo { get; private set; }
 
+        ISimpleApiClient simpleApiClient;
+        [AllowNull]
+        public ISimpleApiClient SimpleApiClient
+        {
+            [return: AllowNull]
+            get { return simpleApiClient; }
+            set
+            {
+                if (simpleApiClient != value && value == null)
+                    apiFactory.ClearFromCache(simpleApiClient);
+                simpleApiClient = value;
+            }
+        }
+
+        protected ISimpleApiClientFactory ApiFactory => apiFactory;
+
         protected MenuBase()
         {
         }
 
-        protected MenuBase(IServiceProvider serviceProvider)
+        protected MenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
         {
             this.serviceProvider = serviceProvider;
+            this.apiFactory = apiFactory;
         }
 
         void RefreshRepo()
@@ -41,10 +65,24 @@ void RefreshRepo()
             }
         }
 
-        protected bool IsGitHubRepo()
+        protected async Task<bool> IsGitHubRepo()
         {
             RefreshRepo();
-            return ActiveRepo?.CloneUrl?.RepositoryName != null && ActiveRepo?.CloneUrl?.IsGithubUri == true;
+
+            var uri = ActiveRepo.CloneUrl;
+            if (uri == null)
+                return false;
+
+            Debug.Assert(apiFactory != null, "apiFactory cannot be null. Did you call the right constructor?");
+            SimpleApiClient = apiFactory.Create(uri);
+
+            var isdotcom = HostAddress.IsGitHubDotComUri(uri.ToRepositoryUrl());
+            if (!isdotcom)
+            {
+                var repo = await SimpleApiClient.GetRepository();
+                return (repo.FullName == ActiveRepo.Name || repo.Id == 0) && SimpleApiClient.IsEnterprise();
+            }
+            return isdotcom;
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using SysTask = System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.Services;
diff --git a/src/GitHub.VisualStudio/Menus/AddConnection.cs b/src/GitHub.VisualStudio/Menus/AddConnection.cs
@@ -4,6 +4,8 @@
 using GitHub.Services;
 using GitHub.UI;
 using GitHub.Extensions;
+using NullGuard;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
@@ -12,8 +14,8 @@ namespace GitHub.VisualStudio.Menus
     public class AddConnection: MenuBase, IMenuHandler
     {
         [ImportingConstructor]
-        public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
@@ -24,11 +26,5 @@ public void Activate()
         {
             StartFlow(UIControllerFlow.Authentication);
         }
-
-        void StartFlow(UIControllerFlow controllerFlow)
-        {
-            var uiProvider = ServiceProvider.GetExportedValue<IUIProvider>();
-            uiProvider.RunUI(controllerFlow, null);
-        }
     }
 }
diff --git a/src/GitHub.VisualStudio/Menus/CopyLink.cs b/src/GitHub.VisualStudio/Menus/CopyLink.cs
@@ -5,6 +5,8 @@
 using GitHub.Extensions;
 using GitHub.Services;
 using GitHub.VisualStudio.UI;
+using System.Threading.Tasks;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
@@ -13,17 +15,18 @@ namespace GitHub.VisualStudio.Menus
     public class CopyLink : LinkMenuBase, IDynamicMenuHandler
     {
         [ImportingConstructor]
-        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
         public int CmdId => PkgCmdIDList.copyLinkCommand;
 
-        public void Activate()
+        public async void Activate([AllowNull]object data = null)
         {
-            if (!IsGitHubRepo())
+            var isgithub = await IsGitHubRepo();
+            if (!isgithub)
                 return;
 
             var link = GenerateLink();
@@ -44,7 +47,11 @@ public void Activate()
 
         public bool CanShow()
         {
-            return IsGitHubRepo();
+            return System.Threading.Tasks.Task.Run(() =>
+            {
+                return IsGitHubRepo(); 
+            }).Result;
         }
+
     }
 }
diff --git a/src/GitHub.VisualStudio/Menus/LinkMenuBase.cs b/src/GitHub.VisualStudio/Menus/LinkMenuBase.cs
@@ -1,13 +1,14 @@
-﻿using GitHub.Extensions;
+﻿using GitHub.Api;
+using GitHub.Extensions;
 using GitHub.Primitives;
 using System;
 
 namespace GitHub.VisualStudio.Menus
 {
     public class LinkMenuBase: MenuBase
     {
-        public LinkMenuBase(IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public LinkMenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
diff --git a/src/GitHub.VisualStudio/Menus/OpenLink.cs b/src/GitHub.VisualStudio/Menus/OpenLink.cs
@@ -3,6 +3,8 @@
 using Microsoft.VisualStudio.Shell;
 using System;
 using System.ComponentModel.Composition;
+using System.Threading.Tasks;
+using GitHub.Api;
 
 namespace GitHub.VisualStudio.Menus
 {
@@ -11,17 +13,18 @@ namespace GitHub.VisualStudio.Menus
     public class OpenLink: LinkMenuBase, IDynamicMenuHandler
     {
         [ImportingConstructor]
-        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
-            : base(serviceProvider)
+        public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)
+            : base(serviceProvider, apiFactory)
         {
         }
 
         public Guid Guid => GuidList.guidContextMenuSet;
         public int CmdId => PkgCmdIDList.openLinkCommand;
 
-        public void Activate()
+        public async void Activate([AllowNull]object data = null)
         {
-            if (!IsGitHubRepo())
+            var isgithub = await IsGitHubRepo();
+            if (!isgithub)
                 return;
 
             var link = GenerateLink();
@@ -33,7 +36,10 @@ public void Activate()
 
         public bool CanShow()
         {
-            return IsGitHubRepo();
+            return System.Threading.Tasks.Task.Run(() =>
+            {
+                return IsGitHubRepo();
+            }).Result;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`
`3`	`4`	`namespace GitHub.VisualStudio`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`using GitHub.Services;`
`5`	`5`	`using GitHub.UI;`
`6`	`6`	`using GitHub.Extensions;`
	`7`	`+using NullGuard;`
	`8`	`+using GitHub.Api;`
`7`	`9`
`8`	`10`	`namespace GitHub.VisualStudio.Menus`
`9`	`11`	`{`
`@@ -12,8 +14,8 @@ namespace GitHub.VisualStudio.Menus`
`12`	`14`	`public class AddConnection: MenuBase, IMenuHandler`
`13`	`15`	`{`
`14`	`16`	`[ImportingConstructor]`
`15`		`- public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`16`		`- : base(serviceProvider)`
	`17`	`+ public AddConnection([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`18`	`+ : base(serviceProvider, apiFactory)`
`17`	`19`	`{`
`18`	`20`	`}`
`19`	`21`
`@@ -24,11 +26,5 @@ public void Activate()`
`24`	`26`	`{`
`25`	`27`	`StartFlow(UIControllerFlow.Authentication);`
`26`	`28`	`}`
`27`		`-`
`28`		`- void StartFlow(UIControllerFlow controllerFlow)`
`29`		`- {`
`30`		`- var uiProvider = ServiceProvider.GetExportedValue<IUIProvider>();`
`31`		`- uiProvider.RunUI(controllerFlow, null);`
`32`		`- }`
`33`	`29`	`}`
`34`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`using GitHub.Extensions;`
`6`	`6`	`using GitHub.Services;`
`7`	`7`	`using GitHub.VisualStudio.UI;`
	`8`	`+using System.Threading.Tasks;`
	`9`	`+using GitHub.Api;`
`8`	`10`
`9`	`11`	`namespace GitHub.VisualStudio.Menus`
`10`	`12`	`{`
`@@ -13,17 +15,18 @@ namespace GitHub.VisualStudio.Menus`
`13`	`15`	`public class CopyLink : LinkMenuBase, IDynamicMenuHandler`
`14`	`16`	`{`
`15`	`17`	`[ImportingConstructor]`
`16`		`- public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`17`		`- : base(serviceProvider)`
	`18`	`+ public CopyLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`19`	`+ : base(serviceProvider, apiFactory)`
`18`	`20`	`{`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public Guid Guid => GuidList.guidContextMenuSet;`
`22`	`24`	`public int CmdId => PkgCmdIDList.copyLinkCommand;`
`23`	`25`
`24`		`- public void Activate()`
	`26`	`+ public async void Activate([AllowNull]object data = null)`
`25`	`27`	`{`
`26`		`- if (!IsGitHubRepo())`
	`28`	`+ var isgithub = await IsGitHubRepo();`
	`29`	`+ if (!isgithub)`
`27`	`30`	`return;`
`28`	`31`
`29`	`32`	`var link = GenerateLink();`
`@@ -44,7 +47,11 @@ public void Activate()`
`44`	`47`
`45`	`48`	`public bool CanShow()`
`46`	`49`	`{`
`47`		`- return IsGitHubRepo();`
	`50`	`+ return System.Threading.Tasks.Task.Run(() =>`
	`51`	`+ {`
	`52`	`+ return IsGitHubRepo();`
	`53`	`+ }).Result;`
`48`	`54`	`}`
	`55`	`+`
`49`	`56`	`}`
`50`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`		`-using GitHub.Extensions;`
	`1`	`+using GitHub.Api;`
	`2`	`+using GitHub.Extensions;`
`2`	`3`	`using GitHub.Primitives;`
`3`	`4`	`using System;`
`4`	`5`
`5`	`6`	`namespace GitHub.VisualStudio.Menus`
`6`	`7`	`{`
`7`	`8`	`public class LinkMenuBase: MenuBase`
`8`	`9`	`{`
`9`		`- public LinkMenuBase(IServiceProvider serviceProvider)`
`10`		`- : base(serviceProvider)`
	`10`	`+ public LinkMenuBase(IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`11`	`+ : base(serviceProvider, apiFactory)`
`11`	`12`	`{`
`12`	`13`	`}`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`using Microsoft.VisualStudio.Shell;`
`4`	`4`	`using System;`
`5`	`5`	`using System.ComponentModel.Composition;`
	`6`	`+using System.Threading.Tasks;`
	`7`	`+using GitHub.Api;`
`6`	`8`
`7`	`9`	`namespace GitHub.VisualStudio.Menus`
`8`	`10`	`{`
`@@ -11,17 +13,18 @@ namespace GitHub.VisualStudio.Menus`
`11`	`13`	`public class OpenLink: LinkMenuBase, IDynamicMenuHandler`
`12`	`14`	`{`
`13`	`15`	`[ImportingConstructor]`
`14`		`- public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`15`		`- : base(serviceProvider)`
	`16`	`+ public OpenLink([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory)`
	`17`	`+ : base(serviceProvider, apiFactory)`
`16`	`18`	`{`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`public Guid Guid => GuidList.guidContextMenuSet;`
`20`	`22`	`public int CmdId => PkgCmdIDList.openLinkCommand;`
`21`	`23`
`22`		`- public void Activate()`
	`24`	`+ public async void Activate([AllowNull]object data = null)`
`23`	`25`	`{`
`24`		`- if (!IsGitHubRepo())`
	`26`	`+ var isgithub = await IsGitHubRepo();`
	`27`	`+ if (!isgithub)`
`25`	`28`	`return;`
`26`	`29`
`27`	`30`	`var link = GenerateLink();`
`@@ -33,7 +36,10 @@ public void Activate()`
`33`	`36`
`34`	`37`	`public bool CanShow()`
`35`	`38`	`{`
`36`		`- return IsGitHubRepo();`
	`39`	`+ return System.Threading.Tasks.Task.Run(() =>`
	`40`	`+ {`
	`41`	`+ return IsGitHubRepo();`
	`42`	`+ }).Result;`
`37`	`43`	`}`
`38`	`44`	`}`
`39`	`45`	`}`