Merge pull request #1351 from ITfoxtec/test

Test

Author: Revsgaard

src/FoxIDs.Control/Controllers/Tracks/TUserController.cs

@@ -186,7 +186,7 @@ public TUserController(TelemetryScopedLogger logger, IServiceProvider servicePro
 
                 var mUser = await tenantDataRepository.GetAsync<User>(await Models.User.IdFormatAsync(RouteBinding, new User.IdKey { Email = user.Email, UserIdentifier = user.Phone ?? user.Username }), queryAdditionalIds: true);
 
-                if ((!mUser.DisableAccount && user.DisableAccount) || user.ChangePassword || user.SetPasswordEmail || user.SetPasswordSms)
+                if (!mUser.DisableAccount && user.DisableAccount)
                 {
                     await oAuthRefreshTokenGrantDownBaseLogic.DeleteRefreshTokenGrantsAsync(user.Email ?? user.Phone ?? user.Username, upPartyType: PartyTypes.Login);
                 }
@@ -325,9 +325,10 @@ public async Task<IActionResult> DeleteUser(string email, string phone, string u
                 phone = phone?.Trim();
                 username = username?.Trim()?.ToLower();
 
+                await tenantDataRepository.DeleteAsync<User>(await Models.User.IdFormatAsync(RouteBinding, new User.IdKey { Email = email, UserIdentifier = phone ?? username }), queryAdditionalIds: true);
+
                 await oAuthRefreshTokenGrantDownBaseLogic.DeleteRefreshTokenGrantsAsync(email ?? phone ?? username, upPartyType: PartyTypes.Login);
 
-                await tenantDataRepository.DeleteAsync<User>(await Models.User.IdFormatAsync(RouteBinding, new User.IdKey { Email = email, UserIdentifier = phone ?? username }), queryAdditionalIds: true);
                 return NoContent();
             }
             catch (FoxIDsDataException ex)

src/FoxIDs.Control/FoxIDs.Control.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>

src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>

src/FoxIDs.ControlClient/Models/ViewModels/Parties/LoginUpPartyViewModel.cs

@@ -97,7 +97,7 @@ public class LoginUpPartyViewModel : IUpPartySessionLifetime, IUpPartyName, IUpP
         /// <summary>
         /// Default false.
         /// </summary>
-        [Display(Name = "Delete refresh tokens if a user change password")]
+        [Display(Name = "Delete refresh tokens if a user change / set password")]
         public bool DeleteRefreshTokenGrantsOnChangePassword { get; set; }
 
         /// <summary>

src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>

src/FoxIDs.ControlShared/Models/Api/Parties/LoginUpParty.cs

@@ -75,6 +75,7 @@ public bool? DisableSetPassword
         [Display(Name = "Users cannot set / reset password with email")]
         public bool DisableSetPasswordEmail { get; set; }
 
+        [Display(Name = "Delete refresh tokens if a user change / set password")]
         public bool DeleteRefreshTokenGrantsOnChangePassword { get; set; }
 
         /// <summary>

src/FoxIDs.Shared/FoxIDs.Shared.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>

src/FoxIDs.Shared/Logic/Seed/SeedLogic.cs

@@ -138,7 +138,7 @@ private async Task SeedDbAsync(bool canSeedMaster, CancellationToken cancellatio
                 {
                     if (!await masterTenantDocumentsSeedLogic.MasterTenantExist())
                     {
-                        throw new Exception("Master tenant not seeded.");
+                        throw new Exception("Master tenant not seeded. Waiting for Control to seed the master tenant...");
                     }
                 }
             }

src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>

src/FoxIDs/FoxIDs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.8.2</Version>
+		<Version>2.8.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>