diff --git a/Yavsc/ApiControllers/AccountController.cs b/Yavsc/ApiControllers/AccountController.cs index bced65a7..b23e8854 100644 --- a/Yavsc/ApiControllers/AccountController.cs +++ b/Yavsc/ApiControllers/AccountController.cs @@ -15,7 +15,7 @@ namespace Yavsc.WebApi.Controllers using System; using System.Linq; - [Authorize(),Route("~/api/account"),Obsolete] + [Authorize(),Route("~/api/account")] public class ApiAccountController : Controller { diff --git a/Yavsc/Controllers/AccountController.cs b/Yavsc/Controllers/AccountController.cs index 5bed1730..3f9f1d31 100644 --- a/Yavsc/Controllers/AccountController.cs +++ b/Yavsc/Controllers/AccountController.cs @@ -216,6 +216,15 @@ namespace Yavsc.Controllers return View(model); } + [Authorize,HttpPost,ValidateAntiForgeryToken] + public async Task SendEMailForConfirm () { + var user = await _userManager.FindByIdAsync( User.GetUserId() ); + var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); + await _emailSender.SendEmailAsync(_siteSettings, _smtpSettings, user.Email, "Confirm your account", + "Please confirm your account by clicking this link: link"); + return View("ConfirmEmailSent"); + } // // POST: /Account/LogOff [HttpPost(Constants.LogoutPath)] diff --git a/Yavsc/Controllers/ManageController.cs b/Yavsc/Controllers/ManageController.cs index d0e05ac0..dd0ad469 100644 --- a/Yavsc/Controllers/ManageController.cs +++ b/Yavsc/Controllers/ManageController.cs @@ -117,7 +117,9 @@ namespace Yavsc.Controllers BankInfo = user.BankInfo, DiskUsage = user.DiskUsage, DiskQuota = user.DiskQuota, - DedicatedCalendarId = user.DedicatedGoogleCalendar + DedicatedCalendarId = user.DedicatedGoogleCalendar, + EMail = user.Email, + EmailConfirmed = await _userManager.IsEmailConfirmedAsync(user) }; model.HaveProfessionalSettings = _dbContext.Performers.Any(x => x.PerformerId == user.Id); var usrActs = _dbContext.UserActivities.Include(a=>a.Does).Where(a=> a.UserId == user.Id); diff --git a/Yavsc/ViewModels/Manage/IndexViewModel.cs b/Yavsc/ViewModels/Manage/IndexViewModel.cs index 216af3ce..7c8cb4c7 100644 --- a/Yavsc/ViewModels/Manage/IndexViewModel.cs +++ b/Yavsc/ViewModels/Manage/IndexViewModel.cs @@ -46,5 +46,9 @@ namespace Yavsc.ViewModels.Manage public long DiskUsage { get; set; } public string DedicatedCalendarId { get; set; } + + public string EMail { get; set; } + public bool EmailConfirmed { get; set; } + } } diff --git a/Yavsc/Views/Account/ConfirmEmail.cshtml b/Yavsc/Views/Account/ConfirmEmail.cshtml index cbec95a9..9afd3b7e 100755 --- a/Yavsc/Views/Account/ConfirmEmail.cshtml +++ b/Yavsc/Views/Account/ConfirmEmail.cshtml @@ -1,10 +1,15 @@ @{ - ViewData["Title"] = "Confirm Email"; + ViewData["Title"] = "Confirmation de votre adresse e-mail"; }

@ViewData["Title"].

- Thank you for confirming your email. Please Click here to Log in. + Merci d'avoir confirmé votre e-mail. + @if (User.GetUserId()==null) { + S'il vous plait, + Cliquez ici pour vous connecter. + + }

diff --git a/Yavsc/Views/Account/ConfirmEmailSent.cshtml b/Yavsc/Views/Account/ConfirmEmailSent.cshtml new file mode 100755 index 00000000..558ad4c1 --- /dev/null +++ b/Yavsc/Views/Account/ConfirmEmailSent.cshtml @@ -0,0 +1,13 @@ +@model string + +@{ + ViewData["Title"] = "S'il vous plait, veuillez confirmer votre adresse e-mail"; +} + +

@ViewData["Title"].

+
+

+ Un message vient de vous être envoyé, à l'adresse e-mail @Model, + Veuillez s-il vous plait confirmer cette adresse de courrier en utilisant le lien hyper-texte qui s'y trouve. +

+
diff --git a/Yavsc/Views/Manage/Index.cshtml b/Yavsc/Views/Manage/Index.cshtml index b9bed038..c287216d 100755 --- a/Yavsc/Views/Manage/Index.cshtml +++ b/Yavsc/Views/Manage/Index.cshtml @@ -18,6 +18,23 @@ asp-action="CHUN">@SR["Change"]] +
@SR["EMail"]:
+ +
+ @Model.EMail + + @if (Model.EmailConfirmed) { + (@SR["Adresse E-mail confirmée"]) + }else { + + (@SR["Adresse non confirmée."]) +
+ +
+
+ } +
+ @if (Model.Roles.Count()>0) {
@SR["Roles"]:
diff --git a/Yavsc/Views/Shared/_LoginPartial.cshtml b/Yavsc/Views/Shared/_LoginPartial.cshtml index 58582b85..c73c3840 100755 --- a/Yavsc/Views/Shared/_LoginPartial.cshtml +++ b/Yavsc/Views/Shared/_LoginPartial.cshtml @@ -20,6 +20,7 @@
  • Formulaires
  • Notifications
  • Excéptions au numéro de SIREN
  • +
  • Accès API
  • }