From 834721f61aaee7c2e269cb1df70a973289a73852 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Mon, 5 Dec 2022 15:03:11 +0900 Subject: refactor: Small changes --- code/api/src/Program.cs | 9 ++++----- code/api/src/Resources/SharedResources.en.Designer.cs | 6 ++++++ code/api/src/Resources/SharedResources.en.resx | 4 ++++ code/api/src/Resources/SharedResources.nb.Designer.cs | 12 ++++++++++++ code/api/src/Resources/SharedResources.nb.resx | 7 +++++++ code/api/src/Resources/SharedResources.resx | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-) (limited to 'code/api') diff --git a/code/api/src/Program.cs b/code/api/src/Program.cs index 87f0537..749c60a 100644 --- a/code/api/src/Program.cs +++ b/code/api/src/Program.cs @@ -1,8 +1,6 @@ global using System; global using System.Linq; global using System.IO; -global using System.Net.Mail; -global using System.Net; global using System.Threading; global using System.Threading.Tasks; global using System.Collections.Generic; @@ -74,6 +72,7 @@ public static class Program new JsonSerializerOptions() { WriteIndented = true })); + builder.Host.UseSerilog(Log.Logger); builder.WebHost.ConfigureKestrel(kestrel => { kestrel.AddServerHeader = false; }); @@ -87,7 +86,7 @@ public static class Program builder.Services.AddLocalization(options => { options.ResourcesPath = "Resources"; }); builder.Services.AddRequestLocalization(options => { - var supportedCultures = new[] {"en-gb", "no-nb"}; + var supportedCultures = new[] {"en", "nb"}; options.SetDefaultCulture(supportedCultures[0]) .AddSupportedCultures(supportedCultures) .AddSupportedUICultures(supportedCultures); @@ -110,7 +109,6 @@ public static class Program }); builder.Services.AddQuartzHostedService(options => { options.WaitForJobsToComplete = true; }); - builder.Services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; options.DefaultChallengeScheme = CookieAuthenticationDefaults.AuthenticationScheme; @@ -176,11 +174,13 @@ public static class Program } }); }); + builder.Services.AddPagination(options => { options.DefaultSize = 50; options.MaxSize = 100; options.CanChangeSizeFromQuery = true; }); + builder.Services .AddControllers() .AddDataAnnotationsLocalization() @@ -191,7 +191,6 @@ public static class Program public static WebApplication CreateWebApplication(WebApplicationBuilder builder) { var app = builder.Build(); - if (app.Environment.IsDevelopment()) { app.UseDeveloperExceptionPage(); app.UseCors(cors => { diff --git a/code/api/src/Resources/SharedResources.en.Designer.cs b/code/api/src/Resources/SharedResources.en.Designer.cs index 4eb786f..02ada48 100644 --- a/code/api/src/Resources/SharedResources.en.Designer.cs +++ b/code/api/src/Resources/SharedResources.en.Designer.cs @@ -74,5 +74,11 @@ namespace IOL.GreatOffice.Api.Resources { return ResourceManager.GetString("One or more fields is invalid", resourceCulture); } } + + internal static string Invalid_username_or_password { + get { + return ResourceManager.GetString("Invalid username or password", resourceCulture); + } + } } } diff --git a/code/api/src/Resources/SharedResources.en.resx b/code/api/src/Resources/SharedResources.en.resx index 5987e8d..87e46e0 100644 --- a/code/api/src/Resources/SharedResources.en.resx +++ b/code/api/src/Resources/SharedResources.en.resx @@ -38,4 +38,8 @@ One or more fields is invalid One or more fields is invalid + + Invalid username or password + Invalid username or password + \ No newline at end of file diff --git a/code/api/src/Resources/SharedResources.nb.Designer.cs b/code/api/src/Resources/SharedResources.nb.Designer.cs index 114c86f..37006f2 100644 --- a/code/api/src/Resources/SharedResources.nb.Designer.cs +++ b/code/api/src/Resources/SharedResources.nb.Designer.cs @@ -68,5 +68,17 @@ namespace IOL.GreatOffice.Api.Resources { return ResourceManager.GetString("One or more fields is invalid", resourceCulture); } } + + internal static string Invalid_username_or_password { + get { + return ResourceManager.GetString("Invalid username or password", resourceCulture); + } + } + + internal static string One_or_more_validation_errors_occured { + get { + return ResourceManager.GetString("One or more validation errors occured", resourceCulture); + } + } } } diff --git a/code/api/src/Resources/SharedResources.nb.resx b/code/api/src/Resources/SharedResources.nb.resx index 6c8937b..880274e 100644 --- a/code/api/src/Resources/SharedResources.nb.resx +++ b/code/api/src/Resources/SharedResources.nb.resx @@ -39,4 +39,11 @@ One or more fields is invalid En eller flere felt er ugyldige + + Ugyldig brukernavn eller passord + Invalid username or password + + + En eller flere valideringsfeil har oppstått + \ No newline at end of file diff --git a/code/api/src/Resources/SharedResources.resx b/code/api/src/Resources/SharedResources.resx index 377994b..833428b 100644 --- a/code/api/src/Resources/SharedResources.resx +++ b/code/api/src/Resources/SharedResources.resx @@ -27,4 +27,7 @@ One or more fields is invalid One or more fields is invalid + + + \ No newline at end of file -- cgit v1.3