Browse Source

record types

pull/1548/head
Borja García Rodríguez 4 years ago
parent
commit
1fe0121e84
18 changed files with 73 additions and 75 deletions
  1. +5
    -5
      src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs
  2. +15
    -17
      src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs
  3. +2
    -2
      src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs
  4. +4
    -4
      src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs
  5. +1
    -1
      src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs
  6. +1
    -1
      src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs
  7. +5
    -5
      src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs
  8. +5
    -5
      src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs
  9. +5
    -5
      src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs
  10. +6
    -6
      src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs
  11. +1
    -1
      src/Services/Identity/Identity.API/Models/ErrorViewModel.cs
  12. +2
    -2
      src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs
  13. +4
    -4
      src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs
  14. +3
    -3
      src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs
  15. +2
    -2
      src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs
  16. +6
    -6
      src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs
  17. +3
    -3
      src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs
  18. +3
    -3
      src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs

+ 5
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs View File

@ -2,11 +2,11 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class ConsentInputModel
public record ConsentInputModel
{ {
public string Button { get; set; }
public IEnumerable<string> ScopesConsented { get; set; }
public bool RememberConsent { get; set; }
public string ReturnUrl { get; set; }
public string Button { get; init; }
public IEnumerable<string> ScopesConsented { get; init; }
public bool RememberConsent { get; init; }
public string ReturnUrl { get; init; }
} }
} }

+ 15
- 17
src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs View File

@ -1,12 +1,10 @@

using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using IdentityServer4.Models; using IdentityServer4.Models;
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class ConsentViewModel : ConsentInputModel
public record ConsentViewModel : ConsentInputModel
{ {
public ConsentViewModel(ConsentInputModel model, string returnUrl, AuthorizationRequest request, Client client, Resources resources) public ConsentViewModel(ConsentInputModel model, string returnUrl, AuthorizationRequest request, Client client, Resources resources)
{ {
@ -24,16 +22,16 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewMo
ResourceScopes = resources.ApiResources.SelectMany(x => x.Scopes).Select(x => new ScopeViewModel(x, ScopesConsented.Contains(x.Name) || model == null)).ToArray(); ResourceScopes = resources.ApiResources.SelectMany(x => x.Scopes).Select(x => new ScopeViewModel(x, ScopesConsented.Contains(x.Name) || model == null)).ToArray();
} }
public string ClientName { get; set; }
public string ClientUrl { get; set; }
public string ClientLogoUrl { get; set; }
public bool AllowRememberConsent { get; set; }
public string ClientName { get; init; }
public string ClientUrl { get; init; }
public string ClientLogoUrl { get; init; }
public bool AllowRememberConsent { get; init; }
public IEnumerable<ScopeViewModel> IdentityScopes { get; set; }
public IEnumerable<ScopeViewModel> ResourceScopes { get; set; }
public IEnumerable<ScopeViewModel> IdentityScopes { get; init; }
public IEnumerable<ScopeViewModel> ResourceScopes { get; init; }
} }
public class ScopeViewModel
public record ScopeViewModel
{ {
public ScopeViewModel(Scope scope, bool check) public ScopeViewModel(Scope scope, bool check)
{ {
@ -55,11 +53,11 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewMo
Checked = check || identity.Required; Checked = check || identity.Required;
} }
public string Name { get; set; }
public string DisplayName { get; set; }
public string Description { get; set; }
public bool Emphasize { get; set; }
public bool Required { get; set; }
public bool Checked { get; set; }
public string Name { get; init; }
public string DisplayName { get; init; }
public string Description { get; init; }
public bool Emphasize { get; init; }
public bool Required { get; init; }
public bool Checked { get; init; }
} }
} }

+ 2
- 2
src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs View File

@ -2,10 +2,10 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class ForgotPasswordViewModel
public record ForgotPasswordViewModel
{ {
[Required] [Required]
[EmailAddress] [EmailAddress]
public string Email { get; set; }
public string Email { get; init; }
} }
} }

+ 4
- 4
src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs View File

@ -1,9 +1,9 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class LoggedOutViewModel
public record LoggedOutViewModel
{ {
public string PostLogoutRedirectUri { get; set; }
public string ClientName { get; set; }
public string SignOutIframeUrl { get; set; }
public string PostLogoutRedirectUri { get; init; }
public string ClientName { get; init; }
public string SignOutIframeUrl { get; init; }
} }
} }

+ 1
- 1
src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs View File

@ -2,7 +2,7 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class LoginViewModel
public record LoginViewModel
{ {
[Required] [Required]
[EmailAddress] [EmailAddress]


+ 1
- 1
src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs View File

@ -1,6 +1,6 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class LogoutViewModel
public record LogoutViewModel
{ {
public string LogoutId { get; set; } public string LogoutId { get; set; }
} }

+ 5
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs View File

@ -2,24 +2,24 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class RegisterViewModel
public record RegisterViewModel
{ {
[Required] [Required]
[EmailAddress] [EmailAddress]
[Display(Name = "Email")] [Display(Name = "Email")]
public string Email { get; set; }
public string Email { get; init; }
[Required] [Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Password")] [Display(Name = "Password")]
public string Password { get; set; }
public string Password { get; init; }
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Confirm password")] [Display(Name = "Confirm password")]
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string ConfirmPassword { get; init; }
public ApplicationUser User { get; set; }
public ApplicationUser User { get; init; }
} }
} }

+ 5
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs View File

@ -2,22 +2,22 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class ResetPasswordViewModel
public record ResetPasswordViewModel
{ {
[Required] [Required]
[EmailAddress] [EmailAddress]
public string Email { get; set; }
public string Email { get; init; }
[Required] [Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)] [DataType(DataType.Password)]
public string Password { get; set; }
public string Password { get; init; }
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Confirm password")] [Display(Name = "Confirm password")]
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string ConfirmPassword { get; init; }
public string Code { get; set; }
public string Code { get; init; }
} }
} }

+ 5
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs View File

@ -3,14 +3,14 @@ using System.Collections.Generic;
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class SendCodeViewModel
public record SendCodeViewModel
{ {
public string SelectedProvider { get; set; }
public string SelectedProvider { get; init; }
public ICollection<SelectListItem> Providers { get; set; }
public ICollection<SelectListItem> Providers { get; init; }
public string ReturnUrl { get; set; }
public string ReturnUrl { get; init; }
public bool RememberMe { get; set; }
public bool RememberMe { get; init; }
} }
} }

+ 6
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs View File

@ -2,20 +2,20 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels
{ {
public class VerifyCodeViewModel
public record VerifyCodeViewModel
{ {
[Required] [Required]
public string Provider { get; set; }
public string Provider { get; init; }
[Required] [Required]
public string Code { get; set; }
public string Code { get; init; }
public string ReturnUrl { get; set; }
public string ReturnUrl { get; init; }
[Display(Name = "Remember this browser?")] [Display(Name = "Remember this browser?")]
public bool RememberBrowser { get; set; }
public bool RememberBrowser { get; init; }
[Display(Name = "Remember me?")] [Display(Name = "Remember me?")]
public bool RememberMe { get; set; }
public bool RememberMe { get; init; }
} }
} }

+ 1
- 1
src/Services/Identity/Identity.API/Models/ErrorViewModel.cs View File

@ -6,7 +6,7 @@ using IdentityServer4.Models;
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models namespace Microsoft.eShopOnContainers.Services.Identity.API.Models
{ {
public class ErrorViewModel
public record ErrorViewModel
{ {
public ErrorMessage Error { get; set; } public ErrorMessage Error { get; set; }
} }

+ 2
- 2
src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs View File

@ -2,11 +2,11 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class AddPhoneNumberViewModel
public record AddPhoneNumberViewModel
{ {
[Required] [Required]
[Phone] [Phone]
[Display(Name = "Phone number")] [Display(Name = "Phone number")]
public string PhoneNumber { get; set; }
public string PhoneNumber { get; init; }
} }
} }

+ 4
- 4
src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs View File

@ -2,22 +2,22 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class ChangePasswordViewModel
public record ChangePasswordViewModel
{ {
[Required] [Required]
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Current password")] [Display(Name = "Current password")]
public string OldPassword { get; set; }
public string OldPassword { get; init; }
[Required] [Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "New password")] [Display(Name = "New password")]
public string NewPassword { get; set; }
public string NewPassword { get; init; }
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Confirm new password")] [Display(Name = "Confirm new password")]
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string ConfirmPassword { get; init; }
} }
} }

+ 3
- 3
src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs View File

@ -3,10 +3,10 @@ using System.Collections.Generic;
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class ConfigureTwoFactorViewModel
public record ConfigureTwoFactorViewModel
{ {
public string SelectedProvider { get; set; }
public string SelectedProvider { get; init; }
public ICollection<SelectListItem> Providers { get; set; }
public ICollection<SelectListItem> Providers { get; init; }
} }
} }

+ 2
- 2
src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs View File

@ -1,7 +1,7 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class FactorViewModel
public record FactorViewModel
{ {
public string Purpose { get; set; }
public string Purpose { get; init; }
} }
} }

+ 6
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs View File

@ -3,16 +3,16 @@ using System.Collections.Generic;
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class IndexViewModel
public record IndexViewModel
{ {
public bool HasPassword { get; set; }
public bool HasPassword { get; init; }
public IList<UserLoginInfo> Logins { get; set; }
public IList<UserLoginInfo> Logins { get; init; }
public string PhoneNumber { get; set; }
public string PhoneNumber { get; init; }
public bool TwoFactor { get; set; }
public bool TwoFactor { get; init; }
public bool BrowserRemembered { get; set; }
public bool BrowserRemembered { get; init; }
} }
} }

+ 3
- 3
src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs View File

@ -2,17 +2,17 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class SetPasswordViewModel
public record SetPasswordViewModel
{ {
[Required] [Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "New password")] [Display(Name = "New password")]
public string NewPassword { get; set; }
public string NewPassword { get; init; }
[DataType(DataType.Password)] [DataType(DataType.Password)]
[Display(Name = "Confirm new password")] [Display(Name = "Confirm new password")]
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string ConfirmPassword { get; init; }
} }
} }

+ 3
- 3
src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs View File

@ -2,14 +2,14 @@
namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels namespace Microsoft.eShopOnContainers.Services.Identity.API.Models.ManageViewModels
{ {
public class VerifyPhoneNumberViewModel
public record VerifyPhoneNumberViewModel
{ {
[Required] [Required]
public string Code { get; set; }
public string Code { get; init; }
[Required] [Required]
[Phone] [Phone]
[Display(Name = "Phone number")] [Display(Name = "Phone number")]
public string PhoneNumber { get; set; }
public string PhoneNumber { get; init; }
} }
} }

Loading…
Cancel
Save