From 692ecad0fb8977cab16209bf8b69f4fe9c0c84fc Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 7 Sep 2017 19:09:27 +0200 Subject: [PATCH] Profile page fixed. Closes #105 --- src/Squidex.Domain.Users.MongoDb/MongoUser.cs | 17 +++++++---------- .../Controllers/UI/Profile/ProfileController.cs | 2 +- src/Squidex/Views/Profile/Profile.cshtml | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Squidex.Domain.Users.MongoDb/MongoUser.cs b/src/Squidex.Domain.Users.MongoDb/MongoUser.cs index 191a66016..859b9d967 100644 --- a/src/Squidex.Domain.Users.MongoDb/MongoUser.cs +++ b/src/Squidex.Domain.Users.MongoDb/MongoUser.cs @@ -157,16 +157,6 @@ namespace Squidex.Domain.Users.MongoDb claims.Foreach(RemoveClaim); } - public void SetClaim(string type, string value) - { - SetClaim(new Claim(type, value)); - } - - public void SetClaim(Claim claim) - { - ReplaceClaim(claim, claim); - } - public string GetToken(string loginProider, string name) { return Tokens.FirstOrDefault(t => t.LoginProvider == loginProider && t.Name == name)?.Value; @@ -182,6 +172,13 @@ namespace Squidex.Domain.Users.MongoDb Tokens.RemoveAll(t => t.LoginProvider == loginProvider && t.Name == name); } + public void SetClaim(string type, string value) + { + Claims.RemoveAll(x => string.Equals(x.Type, type, StringComparison.OrdinalIgnoreCase)); + + AddClaim(new Claim(type, value)); + } + public void ReplaceClaim(Claim existingClaim, Claim newClaim) { RemoveClaim(existingClaim); diff --git a/src/Squidex/Controllers/UI/Profile/ProfileController.cs b/src/Squidex/Controllers/UI/Profile/ProfileController.cs index 86456516b..1e83e891f 100644 --- a/src/Squidex/Controllers/UI/Profile/ProfileController.cs +++ b/src/Squidex/Controllers/UI/Profile/ProfileController.cs @@ -88,7 +88,7 @@ namespace Squidex.Controllers.UI.Profile [HttpPost] [Route("/account/profile/update")] - public Task Profile(ChangeProfileModel model) + public Task UpdateProfile(ChangeProfileModel model) { return MakeChangeAsync(user => userManager.UpdateAsync(user, model.Email, model.DisplayName), "Account updated successfully."); diff --git a/src/Squidex/Views/Profile/Profile.cshtml b/src/Squidex/Views/Profile/Profile.cshtml index cf7a00e49..acab8b46d 100644 --- a/src/Squidex/Views/Profile/Profile.cshtml +++ b/src/Squidex/Views/Profile/Profile.cshtml @@ -41,7 +41,7 @@ -
+