From 34369617770f9ec12052120acc501964281dcabe Mon Sep 17 00:00:00 2001 From: Tino Hager Date: Thu, 22 Feb 2024 22:44:16 +0100 Subject: [PATCH] cleanup web api demo project --- .../GitHub/GitHubClient.cs | 41 ------------------- .../GitHub/Models/Author.cs | 9 ---- .../GitHub/Models/CommitInfo.cs | 12 ------ .../GitHub/Models/Committer.cs | 9 ---- .../GitHub/Models/File.cs | 12 ------ .../GitHub/Models/GitHubCommit.cs | 10 ----- .../GitHub/Models/Tree.cs | 8 ---- .../GitHub/Models/Verification.cs | 10 ----- src/Nager.PublicSuffix.WebApi/Program.cs | 11 ----- 9 files changed, 122 deletions(-) delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/Author.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/CommitInfo.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/Committer.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/File.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/GitHubCommit.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/Tree.cs delete mode 100644 src/Nager.PublicSuffix.WebApi/GitHub/Models/Verification.cs diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs b/src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs deleted file mode 100644 index bdd19b9..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/GitHubClient.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Nager.PublicSuffix.WebApi.GitHub.Models; - -namespace Nager.PublicSuffix.WebApi.GitHub -{ - /// - /// GitHub Client - /// - public class GitHubClient - { - private readonly HttpClient _httpClient; - - /// - /// GitHub Client - /// - /// - public GitHubClient(HttpClient httpClient) - { - this._httpClient = httpClient; - this._httpClient.DefaultRequestHeaders.Add("User-Agent", "Nager.PublicSuffix"); - } - - /// - /// GetCommitAsync - /// - /// - /// - /// - /// - /// - public async Task GetCommitAsync( - string owner, - string repository, - string branch, - CancellationToken cancellationToken = default) - { - var requestUri = $"https://api.github.com/repos/{owner}/{repository}/commits/{branch}"; - - return await this._httpClient.GetFromJsonAsync(requestUri, cancellationToken); - } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Author.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/Author.cs deleted file mode 100644 index b2958bb..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Author.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class Author - { - public string? Name { get; set; } - public string? Email { get; set; } - public DateTime? Date { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/CommitInfo.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/CommitInfo.cs deleted file mode 100644 index d76a967..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/CommitInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class CommitInfo - { - public Author? Author { get; set; } - public Committer? Committer { get; set; } - public string? Message { get; set; } - public Tree? Tree { get; set; } - public string? Url { get; set; } - public Verification? Verification { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Committer.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/Committer.cs deleted file mode 100644 index 21a71af..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Committer.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class Committer - { - public string? Name { get; set; } - public string? Email { get; set; } - public DateTime? Date { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/File.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/File.cs deleted file mode 100644 index da6ac34..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/File.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class File - { - public string? Sha { get; set; } - public string? Filename { get; set; } - public string? Status { get; set; } - public int Additions { get; set; } - public int Deletions { get; set; } - public int Changes { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/GitHubCommit.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/GitHubCommit.cs deleted file mode 100644 index fa6a81d..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/GitHubCommit.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - - public class GitHubCommit - { - public string? Sha { get; set; } - public CommitInfo? Commit { get; set; } - public File[]? Files { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Tree.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/Tree.cs deleted file mode 100644 index d062295..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Tree.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class Tree - { - public string? Sha { get; set; } - public string? Url { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Verification.cs b/src/Nager.PublicSuffix.WebApi/GitHub/Models/Verification.cs deleted file mode 100644 index e040ac8..0000000 --- a/src/Nager.PublicSuffix.WebApi/GitHub/Models/Verification.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Nager.PublicSuffix.WebApi.GitHub.Models -{ - public class Verification - { - public bool Verified { get; set; } = false; - public string? Reason { get; set; } - public string? Signature { get; set; } - public string? Payload { get; set; } - } -} diff --git a/src/Nager.PublicSuffix.WebApi/Program.cs b/src/Nager.PublicSuffix.WebApi/Program.cs index 1812256..1c07b37 100644 --- a/src/Nager.PublicSuffix.WebApi/Program.cs +++ b/src/Nager.PublicSuffix.WebApi/Program.cs @@ -1,7 +1,6 @@ using Nager.PublicSuffix; using Nager.PublicSuffix.RuleProviders; using Nager.PublicSuffix.RuleProviders.CacheProviders; -using Nager.PublicSuffix.WebApi.GitHub; using System.Text.Json.Serialization; using System.Web; @@ -13,7 +12,6 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); -builder.Services.AddScoped(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); @@ -49,15 +47,6 @@ .WithName("DomainInfo") .WithOpenApi(); -app.MapPost("/CheckLastCommit", async (GitHubClient gitHubClient, CancellationToken cancellationToken) => -{ - var lastGitHubCommit = await gitHubClient.GetCommitAsync("publicsuffix", "list", "master", cancellationToken); - - return lastGitHubCommit?.Commit?.Committer?.Date; -}) -.WithName("CheckLastCommit") -.WithOpenApi(); - app.MapPost("/UpdateRules", async (IRuleProvider ruleProvider) => { await ruleProvider.BuildAsync(ignoreCache: true);