Browse Source

Just more consistency.

pull/1016/head
Sebastian 3 years ago
parent
commit
c45d3c7d9f
  1. 2
      backend/src/Squidex.Domain.Users/UserManagerExtensions.cs
  2. 2
      backend/src/Squidex.Domain.Users/UserValues.cs
  3. 9
      backend/src/Squidex/Areas/Api/Controllers/Users/Models/CreateUserDto.cs
  4. 6
      backend/src/Squidex/Areas/Api/Controllers/Users/Models/UpdateProfileDto.cs
  5. 9
      backend/src/Squidex/Areas/Api/Controllers/Users/Models/UpdateUserDto.cs
  6. 5
      backend/src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangeProfileModel.cs

2
backend/src/Squidex.Domain.Users/UserManagerExtensions.cs

@ -100,7 +100,7 @@ internal static class UserManagerExtensions
SyncString(SquidexClaimTypes.DisplayName, values.DisplayName); SyncString(SquidexClaimTypes.DisplayName, values.DisplayName);
SyncString(SquidexClaimTypes.PictureUrl, values.PictureUrl); SyncString(SquidexClaimTypes.PictureUrl, values.PictureUrl);
SyncBoolean(SquidexClaimTypes.Hidden, values.Hidden); SyncBoolean(SquidexClaimTypes.Hidden, values.IsHidden);
SyncBoolean(SquidexClaimTypes.Invited, values.Invited); SyncBoolean(SquidexClaimTypes.Invited, values.Invited);
SyncBoolean(SquidexClaimTypes.Consent, values.Consent); SyncBoolean(SquidexClaimTypes.Consent, values.Consent);
SyncBoolean(SquidexClaimTypes.ConsentForEmails, values.ConsentForEmails); SyncBoolean(SquidexClaimTypes.ConsentForEmails, values.ConsentForEmails);

2
backend/src/Squidex.Domain.Users/UserValues.cs

@ -22,7 +22,7 @@ public sealed class UserValues
public string Email { get; set; } public string Email { get; set; }
public bool? Hidden { get; set; } public bool? IsHidden { get; set; }
public bool? Invited { get; set; } public bool? Invited { get; set; }

9
backend/src/Squidex/Areas/Api/Controllers/Users/Models/CreateUserDto.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using Squidex.Domain.Users; using Squidex.Domain.Users;
using Squidex.Infrastructure.Reflection;
using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Security;
using Squidex.Infrastructure.Validation; using Squidex.Infrastructure.Validation;
using Squidex.Web; using Squidex.Web;
@ -42,12 +43,6 @@ public sealed class CreateUserDto
public UserValues ToValues() public UserValues ToValues()
{ {
return new UserValues return SimpleMapper.Map(this, new UserValues { Permissions = new PermissionSet(Permissions) });
{
Email = Email,
DisplayName = DisplayName,
Password = Password,
Permissions = new PermissionSet(Permissions)
};
} }
} }

6
backend/src/Squidex/Areas/Api/Controllers/Users/Models/UpdateProfileDto.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using Squidex.Domain.Users; using Squidex.Domain.Users;
using Squidex.Infrastructure.Reflection;
using Squidex.Web; using Squidex.Web;
namespace Squidex.Areas.Api.Controllers.Users.Models; namespace Squidex.Areas.Api.Controllers.Users.Models;
@ -20,9 +21,6 @@ public sealed class UpdateProfileDto
public UserValues ToValues() public UserValues ToValues()
{ {
return new UserValues return SimpleMapper.Map(this, new UserValues());
{
Answers = Answers
};
} }
} }

9
backend/src/Squidex/Areas/Api/Controllers/Users/Models/UpdateUserDto.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using Squidex.Domain.Users; using Squidex.Domain.Users;
using Squidex.Infrastructure.Reflection;
using Squidex.Infrastructure.Security; using Squidex.Infrastructure.Security;
using Squidex.Infrastructure.Validation; using Squidex.Infrastructure.Validation;
using Squidex.Web; using Squidex.Web;
@ -41,12 +42,6 @@ public sealed class UpdateUserDto
public UserValues ToValues() public UserValues ToValues()
{ {
return new UserValues return SimpleMapper.Map(this, new UserValues { Permissions = new PermissionSet(Permissions) };
{
Email = Email,
DisplayName = DisplayName,
Password = Password,
Permissions = new PermissionSet(Permissions)
};
} }
} }

5
backend/src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangeProfileModel.cs

@ -1,4 +1,4 @@
// ========================================================================== // ==========================================================================
// Squidex Headless CMS // Squidex Headless CMS
// ========================================================================== // ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt) // Copyright (c) Squidex UG (haftungsbeschraenkt)
@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using Squidex.Domain.Users; using Squidex.Domain.Users;
using Squidex.Infrastructure.Reflection;
using Squidex.Infrastructure.Validation; using Squidex.Infrastructure.Validation;
namespace Squidex.Areas.IdentityServer.Controllers.Profile; namespace Squidex.Areas.IdentityServer.Controllers.Profile;
@ -22,6 +23,6 @@ public class ChangeProfileModel
public UserValues ToValues() public UserValues ToValues()
{ {
return new UserValues { Email = Email, DisplayName = DisplayName, Hidden = IsHidden }; return SimpleMapper.Map(this, new UserValues());
} }
} }

Loading…
Cancel
Save