From c6a54ee2e1c2d826ebac9cc053b74843d112d0a9 Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Sun, 12 Jan 2025 20:05:30 -0600 Subject: [PATCH 1/4] moved db to folder --- .gitignore | 4 +++- barkmanAPI/barkDbModel.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index add57be..06fe016 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ bin/ obj/ /packages/ riderModule.iml -/_ReSharper.Caches/ \ No newline at end of file +/_ReSharper.Caches/ +**/app.db* +**/.idea diff --git a/barkmanAPI/barkDbModel.cs b/barkmanAPI/barkDbModel.cs index fc9e1d3..84799d7 100644 --- a/barkmanAPI/barkDbModel.cs +++ b/barkmanAPI/barkDbModel.cs @@ -12,7 +12,7 @@ public class BarkContext : DbContext { var folder = Environment.SpecialFolder.LocalApplicationData; var path = Environment.GetFolderPath(folder); - DbPath = "./app.db"; + DbPath = "./database/app.db"; } // The following configures EF to create a Sqlite database file in the From 19e1966ecd564f9c0b6714f67807d44851f80bbb Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Tue, 14 Jan 2025 10:46:44 -0600 Subject: [PATCH 2/4] added cors with hardcoded urls --- barkmanAPI/Program.cs | 15 +++++++++++++-- barkmanAPI/appsettings.json | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/barkmanAPI/Program.cs b/barkmanAPI/Program.cs index 19d4ed2..b889330 100644 --- a/barkmanAPI/Program.cs +++ b/barkmanAPI/Program.cs @@ -3,6 +3,8 @@ using Microsoft.OpenApi.Models; var builder = WebApplication.CreateBuilder(args); +var allowSpecificOrigins = "_AllowSpecificOrigins"; + builder.Services.AddDbContext(); builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(c => @@ -10,9 +12,16 @@ builder.Services.AddSwaggerGen(c => c.SwaggerDoc("v1", new OpenApiInfo { Title = "BarkMan API", Description = "BARK BARK WOOF WOOF", Version = "v1" }); }); +builder.Services.AddCors(options => +{ + options.AddPolicy(name: allowSpecificOrigins, + policy => + { + policy.WithOrigins("barkdev.ts.drewr.io","localhost:5145"); + }); +}); var app = builder.Build(); - -if (app.Environment.IsDevelopment()) +if (app.Environment.IsProduction()) { app.UseSwagger(); app.UseSwaggerUI(c => @@ -81,4 +90,6 @@ using (var serviceScope = app.Services.CreateScope()) dbContext.Database.Migrate(); } +app.UseCors(allowSpecificOrigins); + app.Run(); diff --git a/barkmanAPI/appsettings.json b/barkmanAPI/appsettings.json index 10f68b8..1087d50 100644 --- a/barkmanAPI/appsettings.json +++ b/barkmanAPI/appsettings.json @@ -5,5 +5,6 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "CorsAllowedOrgins": "barkdev.ts.drewr.io" } From c5f07c83f1a7c0eb3859c858c32e3423a175bc89 Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Wed, 15 Jan 2025 15:42:03 -0600 Subject: [PATCH 3/4] fixed cors --- barkmanAPI/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/barkmanAPI/Program.cs b/barkmanAPI/Program.cs index b889330..117b593 100644 --- a/barkmanAPI/Program.cs +++ b/barkmanAPI/Program.cs @@ -17,11 +17,11 @@ builder.Services.AddCors(options => options.AddPolicy(name: allowSpecificOrigins, policy => { - policy.WithOrigins("barkdev.ts.drewr.io","localhost:5145"); + policy.WithOrigins("barkdev.ts.drewr.io","localhost:5145", "localhost:5173"); }); }); var app = builder.Build(); -if (app.Environment.IsProduction()) +if (! app.Environment.IsProduction()) { app.UseSwagger(); app.UseSwaggerUI(c => From 0298bbdb2543fc54b8f7296c05684fa0058539a2 Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Wed, 15 Jan 2025 16:14:55 -0600 Subject: [PATCH 4/4] fixed cors? --- barkmanAPI/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barkmanAPI/Program.cs b/barkmanAPI/Program.cs index 117b593..065e481 100644 --- a/barkmanAPI/Program.cs +++ b/barkmanAPI/Program.cs @@ -17,7 +17,7 @@ builder.Services.AddCors(options => options.AddPolicy(name: allowSpecificOrigins, policy => { - policy.WithOrigins("barkdev.ts.drewr.io","localhost:5145", "localhost:5173"); + policy.WithOrigins("https://barkdev.ts.drewr.io", "http://localhost:5173"); }); }); var app = builder.Build();