Removed appsettings.

Author: soup-bowl

backend/Discapp.API/Controllers/AuthController.cs

@@ -5,22 +5,20 @@
 using System.Collections.Specialized;
 using Discapp.API.Models.Auth;
 using Discapp.API.Services;
-using Discapp.Shared.Models;
 
 namespace Discapp.API.Controllers
 {
 	[ApiController]
 	[Route("api/[controller]")]
-	public class AuthController(IHttpClientFactory httpClientFactory, IAuthService authService, IOptions<DiscogApiSettings> discogSettings) : ControllerBase
+	public class AuthController(IHttpClientFactory httpClientFactory, IAuthService authService) : ControllerBase
 	{
 		private readonly HttpClient _httpClient = httpClientFactory.CreateClient();
 		private readonly IAuthService _authService = authService;
-		private readonly DiscogApiSettings _discogSettings = discogSettings.Value;
 
 		[HttpGet("Token")]
 		public async Task<ActionResult<AuthToken>> GetRequestToken()
 		{
-			HttpRequestMessage request = new(HttpMethod.Get, _discogSettings.RequestTokenUrl);
+			HttpRequestMessage request = new(HttpMethod.Get, "https://api.discogs.com/oauth/request_token");
 			request.Headers.Add("Authorization", _authService.TokenRequestHeader());
 			request.Headers.Add("User-Agent", _authService.UserAgent());
 			request.Content = new StringContent("", Encoding.UTF8, "application/x-www-form-urlencoded");
@@ -37,7 +35,7 @@ public async Task<ActionResult<AuthToken>> GetRequestToken()
 
 			return Ok(new AuthToken
 			{
-				RedirectUrl = $"{_discogSettings.AuthorizeUrl}?oauth_token={oauthToken}",
+				RedirectUrl = $"https://www.discogs.com/oauth/authorize?oauth_token={oauthToken}",
 				TokenSecret = oauthTokenSecret ?? ""
 			});
 		}
@@ -46,7 +44,7 @@ public async Task<ActionResult<AuthToken>> GetRequestToken()
 		[HttpGet("Callback")]
 		public async Task<ActionResult<CallbackToken>> HandleCallback([FromQuery] CallbackInput oauth_details)
 		{
-			HttpRequestMessage request = new(HttpMethod.Post, _discogSettings.AccessTokenUrl);
+			HttpRequestMessage request = new(HttpMethod.Post, "https://api.discogs.com/oauth/access_token");
 			request.Headers.Add("Authorization", _authService.TokenCallbackHeader(oauth_details));
 			request.Headers.Add("User-Agent", _authService.UserAgent());
 			request.Content = new StringContent("", Encoding.UTF8, "application/x-www-form-urlencoded");

backend/Discapp.API/Controllers/DiscogsController.cs

@@ -5,18 +5,16 @@
 using Discapp.API.Models.Discogs;
 using Discapp.API.Models.Auth;
 using Discapp.API.Services;
-using Discapp.Shared.Models;
 
 namespace Discapp.API.Controllers
 {
 	[ApiController]
 	[Route("api/[controller]")]
-	public class DiscogsController(IHttpClientFactory httpClientFactory, IAuthService authService, IImageProcessService imageService, IOptions<DiscogApiSettings> discogSettings) : ControllerBase
+	public class DiscogsController(IHttpClientFactory httpClientFactory, IAuthService authService, IImageProcessService imageService) : ControllerBase
 	{
 		private readonly HttpClient _httpClient = httpClientFactory.CreateClient();
 		private readonly IAuthService _authService = authService;
 		private readonly IImageProcessService _imageService = imageService;
-		private readonly DiscogApiSettings _discogSettings = discogSettings.Value;
 
 		[HttpGet("Identify")]
 		public Task<ActionResult<DiscogsIdentity>> GetIdentity([FromHeader(Name = "Authorization")] string token) =>
@@ -94,7 +92,7 @@ private async Task<ActionResult<T>> SendDiscogsRequestAsync<T>(string endpoint,
 			if (token is null)
 				return BadRequest("Invalid token.");
 
-			HttpRequestMessage request = new(HttpMethod.Get, $"{_discogSettings.BaseUrl}/{endpoint}");
+			HttpRequestMessage request = new(HttpMethod.Get, $"https://api.discogs.com/{endpoint}");
 			request.Headers.Add("Authorization", _authService.AuthenticatedRequestHeader(token));
 			request.Headers.Add("User-Agent", _authService.UserAgent());
 

backend/Discapp.API/Program.cs

@@ -4,7 +4,6 @@
 using Discapp.API.Services;
 using Microsoft.OpenApi.Models;
 using Discapp.API.Models.Auth;
-using Discapp.Shared.Models;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -21,8 +20,6 @@
 var ClientSecret = Environment.GetEnvironmentVariable("LOCALIB_DISCOGS_CONSUMER_SECRET");
 var CallbackURL = Environment.GetEnvironmentVariable("LOCALIB_DISCOGS_CALLBACK_URL");
 
-builder.Services.Configure<DiscogApiSettings>(builder.Configuration.GetSection("DiscogApis"));
-
 // --- CORS ---
 string? allowedOrigins = Environment.GetEnvironmentVariable("LOCALIB_CORS_ALLOWED_ORIGINS");
 if (string.IsNullOrEmpty(allowedOrigins))

backend/Discapp.API/appsettings.json

@@ -1,10 +1,4 @@
 {
-  "DiscogApis": {
-    "BaseUrl": "https://api.discogs.com",
-    "RequestTokenUrl": "https://api.discogs.com/oauth/request_token",
-    "AuthorizeUrl": "https://www.discogs.com/oauth/authorize",
-    "AccessTokenUrl": "https://api.discogs.com/oauth/access_token"
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

backend/Discapp.Shared/Models/DiscogApiSettings.cs

@@ -2,7 +2,6 @@
 using Discapp.Worker.Models;
 using Discapp.Shared.Data;
 using Microsoft.EntityFrameworkCore;
-using Discapp.Shared.Models;
 
 var builder = Host.CreateApplicationBuilder(args);
 
@@ -18,8 +17,6 @@
 var ClientKey = Environment.GetEnvironmentVariable("LOCALIB_DISCOGS_CONSUMER_KEY") ?? "";
 var ClientSecret = Environment.GetEnvironmentVariable("LOCALIB_DISCOGS_CONSUMER_SECRET") ?? "";
 
-builder.Services.Configure<DiscogApiSettings>(builder.Configuration.GetSection("DiscogApis"));
-
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
     options.UseNpgsql(connectionString)
 );

backend/Discapp.Worker/Program.cs

@@ -1,5 +1,4 @@
 using Discapp.Worker.Models;
-using Discapp.Shared.Models;
 using Discapp.Shared.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -17,18 +16,16 @@ public class Worker : BackgroundService
 	private readonly DiscogsOptions _discogsOptions;
 	private readonly PathSettings _pathOptions;
 	private readonly HttpClient _httpClient;
-	private readonly DiscogApiSettings _discogSettings;
 
-	public Worker(ILogger<Worker> logger, IServiceScopeFactory scopeFactory, IOptions<DiscogsOptions> discogsOptions, IOptions<PathSettings> pathOptions, IOptions<DiscogApiSettings> discogSettings)
+	public Worker(ILogger<Worker> logger, IServiceScopeFactory scopeFactory, IOptions<DiscogsOptions> discogsOptions, IOptions<PathSettings> pathOptions)
 	{
 		_logger = logger;
 		_scopeFactory = scopeFactory;
 		_discogsOptions = discogsOptions.Value;
 		_pathOptions = pathOptions.Value;
-		_discogSettings = discogSettings.Value;
 		_httpClient = new HttpClient
 		{
-			BaseAddress = new Uri(_discogSettings.BaseUrl)
+			BaseAddress = new Uri("https://api.discogs.com")
 		};
 		_httpClient.DefaultRequestHeaders.Add("User-Agent", "DiscappWorker/1.0");
 		_httpClient.DefaultRequestHeaders.Add("Authorization", $"Discogs key={_discogsOptions.ConsumerKey}, secret={_discogsOptions.ConsumerSecret}");