diff --git a/src/Yavsc/Controllers/Accounting/AccountController.cs b/src/Yavsc/Controllers/Accounting/AccountController.cs index 2c73354b..2a45b59a 100644 --- a/src/Yavsc/Controllers/Accounting/AccountController.cs +++ b/src/Yavsc/Controllers/Accounting/AccountController.cs @@ -28,6 +28,7 @@ using System.Security.Cryptography; using System.Text.Unicode; using System.Text; using Yavsc.Server.Helpers; +using System.Reflection; namespace Yavsc.Controllers { @@ -45,6 +46,7 @@ namespace Yavsc.Controllers readonly TwilioSettings _twilioSettings; readonly IStringLocalizer _localizer; + private readonly IStringLocalizer _localizer2; // TwilioSettings _twilioSettings; @@ -66,7 +68,7 @@ namespace Yavsc.Controllers ITrueEmailSender emailSender, IOptions siteSettings, ILoggerFactory loggerFactory, IOptions twilioSettings, - IStringLocalizer localizer, + IStringLocalizerFactory localizerFactory, ApplicationDbContext dbContext) { _interaction = interaction; @@ -81,8 +83,13 @@ namespace Yavsc.Controllers _siteSettings = siteSettings.Value; _twilioSettings = twilioSettings.Value; _logger = loggerFactory.CreateLogger(); - _localizer = localizer; + _dbContext = dbContext; + var type = typeof(Yavsc.YavscLocalization); + var assemblyName = new AssemblyName(type.GetTypeInfo().Assembly.FullName); + _localizer = localizerFactory.Create(type); + _localizer2 = localizerFactory.Create("SharedResource", assemblyName.Name); + } diff --git a/src/Yavsc/Extensions/HostingExtensions.cs b/src/Yavsc/Extensions/HostingExtensions.cs index 48d8e392..7dcfc7ad 100644 --- a/src/Yavsc/Extensions/HostingExtensions.cs +++ b/src/Yavsc/Extensions/HostingExtensions.cs @@ -406,33 +406,42 @@ public static class HostingExtensions var context = serviceScope.ServiceProvider.GetRequiredService(); - context.Database.Migrate(); - - if (!context.Clients.Any()) + try { - foreach (var client in Config.Clients) - { - context.Clients.Add(client.ToEntity()); - } - context.SaveChanges(); - } - if (!context.IdentityResources.Any()) - { - foreach (var resource in Config.IdentityResources) - { - context.IdentityResources.Add(resource.ToEntity()); - } - context.SaveChanges(); - } - if (!context.ApiScopes.Any()) - { - foreach (var resource in Config.ApiScopes) + context.Database.Migrate(); + + if (!context.Clients.Any()) { - context.ApiScopes.Add(resource.ToEntity()); + foreach (var client in Config.Clients) + { + context.Clients.Add(client.ToEntity()); + } + context.SaveChanges(); } - context.SaveChanges(); + + if (!context.IdentityResources.Any()) + { + foreach (var resource in Config.IdentityResources) + { + context.IdentityResources.Add(resource.ToEntity()); + } + context.SaveChanges(); + } + + if (!context.ApiScopes.Any()) + { + foreach (var resource in Config.ApiScopes) + { + context.ApiScopes.Add(resource.ToEntity()); + } + context.SaveChanges(); + } + } + catch (InvalidOperationException ex) + { + app.Properties["DegradedDBContext"] = ex.Message; } } } diff --git a/src/Yavsc/Views/Account/AccountCreated.cshtml b/src/Yavsc/Views/Account/AccountCreated.cshtml new file mode 100644 index 00000000..b2d5b8f6 --- /dev/null +++ b/src/Yavsc/Views/Account/AccountCreated.cshtml @@ -0,0 +1,10 @@ +@{ + ViewData["Title"] = "Account creation success"; + +} + +

@ViewData["Title"]

+ +Your account has successfully been created. + +Return to home diff --git a/src/Yavsc/Views/Account/AdminSendConfirationEmail.cshtml b/src/Yavsc/Views/Account/AdminSendConfirationEmail.cshtml new file mode 100755 index 00000000..99fc029f --- /dev/null +++ b/src/Yavsc/Views/Account/AdminSendConfirationEmail.cshtml @@ -0,0 +1,12 @@ +@model Yavsc.Abstract.Manage.EmailSentViewModel + +@{ + ViewData["Title"] = "S'il vous plait, veuillez confirmer votre adresse e-mail"; +} + +

@ViewData["Title"].

+
+

+ Un message vient d'être envoyé à l'adresse e-mail ( @Model.EMail , id:@Model.MessageId ). +

+