Don't require GH CLI for specific account sync

This makes the sync operation way more friendly. We can probably provide a global tool too since the CLI wouldn't be strictly required.

src/Commands/SyncCommand.cs

@@ -55,15 +55,19 @@ public class SyncSettings : CommandSettings
 
     public override async Task<int> ExecuteAsync(CommandContext context, SyncSettings settings)
     {
-        var result = await base.ExecuteAsync(context, settings);
-        if (result != 0)
-            return result;
+        var firstRunCompleted = config.TryGetBoolean("sponsorlink", "firstrun", out var completed) && completed;
 
+        if (!firstRunCompleted &&
+            app.Run(["welcome"]) is var welcome &&
+            welcome < 0)
+        {
+            return welcome;
+        }
+
+        var result = 0;
         var ghDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sponsorlink", "github");
         Directory.CreateDirectory(ghDir);
 
-        Debug.Assert(Account != null, "After authentication, Account should never be null.");
-
         var sponsorables = new HashSet<string>();
         if (settings.Sponsorable?.Length > 0)
         {
@@ -76,6 +80,11 @@ public override async Task<int> ExecuteAsync(CommandContext context, SyncSetting
         }
         else
         {
+            // In order to run discovery, we need an authenticated user
+            result = await base.ExecuteAsync(context, settings);
+            if (result != 0)
+                return result;
+
             // Discover all candidate sponsorables for the current user
             if (await Status().StartAsync(Sync.QueryingUserSponsorships, async _ =>
             {
@@ -133,8 +142,21 @@ await Status().StartAsync(Sync.FetchingManifests(sponsorables.Count), async ctx
             {
                 ctx.Status = Sync.DetectingManifest(sponsorable);
                 using var http = httpFactory.CreateClient();
-                var branch = await client.QueryAsync(GraphQueries.DefaultBranch(sponsorable, ".github"));
+
+                // First try default branch
+                var branch = "main";
                 var (status, manifest) = await SponsorableManifest.FetchAsync(sponsorable, branch, http);
+                if (status == SponsorableManifest.Status.NotFound)
+                {
+                    // We can directly query via the default HTTP client since the .github repository must be public.
+                    branch = await httpFactory.GetQueryClient().QueryAsync(new GraphQuery(
+                        $"/repos/{sponsorable}/.github", ".default_branch") { IsLegacy = true });
+
+                    if (branch != null && branch != "main")
+                        // Retry discovery with non-'main' branch
+                        (status, manifest) = await SponsorableManifest.FetchAsync(sponsorable, branch, http);
+                }
+
                 switch (status)
                 {
                     case SponsorableManifest.Status.OK when manifest != null:
@@ -226,7 +248,6 @@ await Status().StartAsync(Sync.Synchronizing(manifest.Sponsorable), async ctx =>
             }
         }
 
-        var config = DotNetConfig.Config.Build(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sponsorlink"));
         var autosync = settings.AutoSync;
 
         if (!settings.Unattended &&

src/Core/HttpGraphQueryClient.cs

@@ -18,6 +18,9 @@ public static class GraphQueryClientExtensions
     public static IServiceCollection AddGraphQueryClient(this IServiceCollection services)
         => services.AddSingleton<IGraphQueryClientFactory, GraphQueryClientFactory>();
 
+    public static IGraphQueryClient GetQueryClient(this IHttpClientFactory factory, string name = "")
+        => new HttpGraphQueryClient(factory, name);
+
     class GraphQueryClientFactory(IHttpClientFactory http) : IGraphQueryClientFactory
     {
         public IGraphQueryClient CreateClient(string name) => new HttpGraphQueryClient(http, name);

src/Core/SponsorableManifest.cs

@@ -49,11 +49,12 @@ public static SponsorableManifest Create(Uri issuer, Uri[] audience, string clie
     {
         // Try to detect sponsorlink manifest in the sponsorable .github repo
         var url = $"https://github.com/{sponsorable}/.github/raw/{branch ?? "main"}/sponsorlink.jwt";
-
+        var disposeHttp = http == null;
+
         // Manifest should be public, so no need for any special HTTP client.
-        using (http ??= new HttpClient())
+        try
         {
-            var response = await http.GetAsync(url);
+            var response = await (http ?? new HttpClient()).GetAsync(url);
             if (!response.IsSuccessStatusCode)
                 return (Status.NotFound, default);
 
@@ -67,6 +68,11 @@ public static SponsorableManifest Create(Uri issuer, Uri[] audience, string clie
 
             return (Status.OK, manifest);
         }
+        finally
+        {
+            if (disposeHttp)
+                http?.Dispose();
+        }
     }
 
     /// <summary>

src/Tests/Helpers.cs

@@ -24,7 +24,12 @@ class Helpers
     static Helpers()
     {
         var collection = new ServiceCollection()
-            .AddHttpClient()
+            .AddHttpClient().ConfigureHttpClientDefaults(defaults => defaults.ConfigureHttpClient(http =>
+            {
+                http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(ThisAssembly.Info.Product, ThisAssembly.Info.InformationalVersion));
+                if (Debugger.IsAttached)
+                    http.Timeout = TimeSpan.FromMinutes(10);
+            }))
             .AddLogging()
             .AddSingleton<IConfiguration>(Configuration)
             .AddSingleton(_ => AsyncLazy.Create(async () =>
@@ -49,14 +54,12 @@ static Helpers()
             collection.AddHttpClient("GitHub", http =>
             {
                 http.BaseAddress = new Uri("https://api.github.com");
-                http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(ThisAssembly.Info.Product, ThisAssembly.Info.InformationalVersion));
                 http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", ghtoken);
             });
 
             collection.AddHttpClient("GitHub:Token", http =>
             {
                 http.BaseAddress = new Uri("https://api.github.com");
-                http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(ThisAssembly.Info.Product, ThisAssembly.Info.InformationalVersion));
                 http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", ghtoken);
             });
         }
@@ -66,7 +69,6 @@ static Helpers()
             collection.AddHttpClient("GitHub:Sponsorable", http =>
             {
                 http.BaseAddress = new Uri("https://api.github.com");
-                http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(ThisAssembly.Info.Product, ThisAssembly.Info.InformationalVersion));
                 http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", ghsponsorable);
             });
         }

src/Tests/SyncCommandTests.cs

@@ -134,24 +134,20 @@ public async Task ExplicitSponsorableSync_NoSponsorableManifest()
     }
 
     [LocalFact("GitHub:Token")]
-    public async Task ExplicitSponsorableSync_InvalidSponsorableManifest()
+    public async Task ExplicitSponsorableSync_InvalidSponsorableManifestNonMainBranch()
     {
         EnsureAuthenticated();
 
-        var graph = new Mock<IGraphQueryClient>();
-        // Return default 'main' branch from GraphQueries.DefaultBranch
-        graph.Setup(x => x.QueryAsync(GraphQueries.DefaultBranch("kzu", ".github"))).ReturnsAsync("sponsorlink");
-
         var command = new SyncCommand(
             Mock.Of<ICommandApp>(MockBehavior.Strict),
             config,
-            graph.Object,
+            Mock.Of<IGraphQueryClient>(MockBehavior.Strict),
             Mock.Of<IGitHubAppAuthenticator>(MockBehavior.Strict),
             Services.GetRequiredService<IHttpClientFactory>());
 
         var settings = new SyncCommand.SyncSettings
         {
-            Sponsorable = ["kzu"],
+            Sponsorable = ["devlooped-bot"],
             Unattended = true,
         };