Merge branch 'release/6.23.0'

VirtoCommerce · Jun 26, 2023 · c7db101 · c7db101
2 parents e4197de + 5188296
commit c7db101
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.22.0</VersionPrefix>
+    <VersionPrefix>6.23.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Controllers/Api/ApiAccountController.cs b/VirtoCommerce.Storefront/Controllers/Api/ApiAccountController.cs
@@ -513,5 +513,13 @@ private async Task SetLastLoginDate(User user)
             user.LastLoginDate = DateTime.UtcNow;
             await _signInManager.UserManager.UpdateAsync(user);
         }
+
+        // GET: storefrontapi/account/passwordrequirements
+        [HttpGet("passwordrequirements")]
+        [AllowAnonymous]
+        public ActionResult<PasswordOptions> GetPasswordRequirements()
+        {
+            return _identityOptions.Password;
+        }
     }
 }
diff --git a/VirtoCommerce.Storefront/Domain/Security/SecurityConverter.cs b/VirtoCommerce.Storefront/Domain/Security/SecurityConverter.cs
@@ -143,6 +143,7 @@ public static dto.ApplicationUser ToUserDto(this User user)
                 IsAdministrator = user.IsAdministrator,
                 PhoneNumber = user.PhoneNumber,
                 PhoneNumberConfirmed = user.PhoneNumberConfirmed,
+                PasswordExpired = user.PasswordExpired,
             };
 
             if (!user.Roles.IsNullOrEmpty())