diff --git a/services/bytefy.image/bytefy.image/CorsSettings.cs b/services/bytefy.image/bytefy.image/CorsSettings.cs new file mode 100644 index 0000000..2115af1 --- /dev/null +++ b/services/bytefy.image/bytefy.image/CorsSettings.cs @@ -0,0 +1,6 @@ +namespace bytefy.image; + +public class CorsSettings +{ + public string[] AllowedOrigins { get; set; } +} \ No newline at end of file diff --git a/services/bytefy.image/bytefy.image/Program.cs b/services/bytefy.image/bytefy.image/Program.cs index 5870166..e8db155 100644 --- a/services/bytefy.image/bytefy.image/Program.cs +++ b/services/bytefy.image/bytefy.image/Program.cs @@ -3,13 +3,17 @@ using ImageMagick; using Microsoft.AspNetCore.Antiforgery; var builder = WebApplication.CreateBuilder(args); + builder.Services.AddAntiforgery(options => options.HeaderName = "2311d8d8-607d-4747-8939-1bde65643254"); builder.Services.AddSingleton(); builder.Services.AddHostedService(provider => provider.GetRequiredService()); + +var corsSettings = builder.Configuration.GetSection("Cors").Get(); + builder.Services.AddCors(options => { options.AddPolicy("AllowSpecificOrigin", - builder => builder.WithOrigins("http://localhost:4200") + builder => builder.WithOrigins(corsSettings.AllowedOrigins) .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials()); diff --git a/services/bytefy.image/bytefy.image/appsettings.Development.json b/services/bytefy.image/bytefy.image/appsettings.Development.json index 323fdd3..ef9eb20 100644 --- a/services/bytefy.image/bytefy.image/appsettings.Development.json +++ b/services/bytefy.image/bytefy.image/appsettings.Development.json @@ -2,8 +2,14 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning", + "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "Cors": { + "AllowedOrigins": [ + "http://localhost:4200", + "https://localhost:4200" + ] + } } diff --git a/services/bytefy.image/bytefy.image/appsettings.json b/services/bytefy.image/bytefy.image/appsettings.json index 10f68b8..6414d74 100644 --- a/services/bytefy.image/bytefy.image/appsettings.json +++ b/services/bytefy.image/bytefy.image/appsettings.json @@ -5,5 +5,10 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "Cors": { + "AllowedOrigins": [ + "http://bytefy.net", + "https://bytefy.net" + ] + } } diff --git a/tools/angular.json b/tools/angular.json index 8f8fe84..934e802 100644 --- a/tools/angular.json +++ b/tools/angular.json @@ -28,7 +28,8 @@ "inlineStyleLanguage": "scss", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/web.config" ], "styles": [ "src/styles.scss" @@ -54,7 +55,13 @@ "development": { "optimization": false, "extractLicenses": false, - "sourceMap": true + "sourceMap": true, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.development.ts" + } + ] } }, "defaultConfiguration": "production" @@ -88,7 +95,8 @@ "inlineStyleLanguage": "scss", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/web.config" ], "styles": [ "src/styles.scss" diff --git a/tools/src/environments/environment.development.ts b/tools/src/environments/environment.development.ts new file mode 100644 index 0000000..fb952fc --- /dev/null +++ b/tools/src/environments/environment.development.ts @@ -0,0 +1,4 @@ +export const environment = { + production: false, + uploadServiceBaseUrl: 'http://localhost:1337' + }; \ No newline at end of file diff --git a/tools/src/environments/environment.ts b/tools/src/environments/environment.ts index 8fe1c72..dc7941d 100644 --- a/tools/src/environments/environment.ts +++ b/tools/src/environments/environment.ts @@ -1,4 +1,4 @@ export const environment = { - production: false, - uploadServiceBaseUrl: 'http://localhost:1337' + production: true, + uploadServiceBaseUrl: 'http://image.bytefy.net' }; \ No newline at end of file diff --git a/tools/src/web.config b/tools/src/web.config new file mode 100644 index 0000000..ce4c4cb --- /dev/null +++ b/tools/src/web.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file