Removed old LocalizeResources + fix some old status

JonPSmith · JonPSmith · commit 757ee2d37597 · 2022-12-28T10:10:20.000Z
diff --git a/AuthPermissions.AspNetCore/AccessTenantData/Services/LinkToTenantDataService.cs b/AuthPermissions.AspNetCore/AccessTenantData/Services/LinkToTenantDataService.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using AuthPermissions.AdminCode;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
@@ -59,15 +58,16 @@ public LinkToTenantDataService(
     /// <exception cref="AuthPermissionsException"></exception>
     public async Task<IStatusGeneric> StartLinkingToTenantDataAsync(string currentUserId, int tenantId)
     {
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
 
         if (_options.LinkToTenantType == LinkToTenantTypes.NotTurnedOn)
             throw new AuthPermissionsException(
                 $"You must set up the {nameof(AuthPermissionsOptions.LinkToTenantType)} to use the Access Tenant Data feature.");
 
         var user = await _context.AuthUsers.SingleOrDefaultAsync(x => x.UserId == currentUserId);
         if (user == null)
-            return status.AddErrorString("UserNotFound".ClassLocalizeKey(this, true), "Could not find the user you were looking for.");
+            return status.AddErrorString("UserNotFound".ClassLocalizeKey(this, true), //common 
+                "Could not find the user you were looking for.");
 
         if (user.TenantId != null && _options.LinkToTenantType != LinkToTenantTypes.AppAndHierarchicalUsers)
             throw new AuthPermissionsException(
@@ -76,7 +76,8 @@ public async Task<IStatusGeneric> StartLinkingToTenantDataAsync(string currentUs
 
         var tenantToLinkTo = await _context.Tenants.SingleOrDefaultAsync(x => x.TenantId == tenantId);
         if (tenantToLinkTo == null)
-            return status.AddErrorString("TenantNotFound".ClassLocalizeKey(this, true), "Could not find the tenant you were looking for.");
+            return status.AddErrorString("TenantNotFound".ClassLocalizeKey(this, true), 
+                "Could not find the tenant you were looking for.");
 
         if (status.HasErrors)
             return status;
diff --git a/AuthPermissions.AspNetCore/JwtTokenCode/TokenBuilder.cs b/AuthPermissions.AspNetCore/JwtTokenCode/TokenBuilder.cs
@@ -76,7 +76,7 @@ public async Task<TokenAndRefreshToken> GenerateTokenAndRefreshTokenAsync(string
 
             var refreshToken = RefreshToken.CreateNewRefreshToken(userId, token.Id);
             _context.Add(refreshToken);
-            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());
+            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());
             status.IfErrorsTurnToException();
 
             return new TokenAndRefreshToken
@@ -146,7 +146,7 @@ public async Task<TokenAndRefreshToken> GenerateTokenAndRefreshTokenAsync(string
             var newRefreshToken = RefreshToken.CreateNewRefreshToken(userId, token.Id);
 
             _context.Add(newRefreshToken);
-            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());
+            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());
             status.IfErrorsTurnToException();
 
             return (new TokenAndRefreshToken
diff --git a/AuthPermissions.AspNetCore/Services/DisableJwtRefreshToken.cs b/AuthPermissions.AspNetCore/Services/DisableJwtRefreshToken.cs
@@ -43,7 +43,7 @@ public async Task LogoutUserViaRefreshTokenAsync(string refreshToken)
             if (latestValidRefreshToken != null)
             {
                 latestValidRefreshToken.MarkAsInvalid();
-                var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());
+                var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());
                 status.IfErrorsTurnToException();
             }
         }
@@ -61,7 +61,7 @@ public async Task LogoutUserViaUserIdAsync(string userId)
                 .ToListAsync();
 
             latestValidRefreshTokens.ForEach(x => x.MarkAsInvalid());
-            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());
+            var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());
             status.IfErrorsTurnToException();
         }
     }
diff --git a/AuthPermissions.AspNetCore/Services/ShardingConnections.cs b/AuthPermissions.AspNetCore/Services/ShardingConnections.cs
@@ -156,7 +156,7 @@ public string FormConnectionString(string databaseInfoName)
     /// <exception cref="ArgumentNullException"></exception>
     public IStatusGeneric TestFormingConnectionString(DatabaseInformation databaseInfo)
     {
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
 
         if (databaseInfo == null)
             throw new ArgumentNullException(nameof(databaseInfo));
diff --git a/AuthPermissions.BaseCode/DataLayer/EfCode/SaveChangesExtensions.cs b/AuthPermissions.BaseCode/DataLayer/EfCode/SaveChangesExtensions.cs
@@ -74,7 +74,7 @@ private enum ExceptionTypes {Duplicate, ConcurrencyError}
         private static IStatusGeneric ConvertExceptionToStatus(this IReadOnlyList<EntityEntry> entities,
             ExceptionTypes exceptionType, IDefaultLocalizer localizeDefault)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(localizeDefault);
+            var status = new StatusGenericLocalizer(localizeDefault);
 
             //NOTE: These is only one entity in an exception
             if (entities.Any())
diff --git a/AuthPermissions.BaseCode/LocalizeResources.cs b/AuthPermissions.BaseCode/LocalizeResources.cs
diff --git a/AuthPermissions.SupportCode/AddUsersServices/Authentication/AzureAdNewUserManager.cs b/AuthPermissions.SupportCode/AddUsersServices/Authentication/AzureAdNewUserManager.cs
@@ -63,7 +63,7 @@ public AzureAdNewUserManager(IAuthUsersAdminService authUsersAdmin, IAuthTenantA
     /// <returns>status, with error if there an user already</returns>
     public async Task<IStatusGeneric> CheckNoExistingAuthUserAsync(AddNewUserDto newUser)
     {
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
         if ((await _authUsersAdmin.FindAuthUserByEmailAsync(newUser.Email))?.Result != null)
             return status.AddErrorString("ExistingUser".ClassLocalizeKey(this, true),
                 "There is already an AuthUser with your email, so you can't add another.",
diff --git a/AuthPermissions.SupportCode/AddUsersServices/Authentication/IndividualUserAddUserManager.cs b/AuthPermissions.SupportCode/AddUsersServices/Authentication/IndividualUserAddUserManager.cs
@@ -63,7 +63,7 @@ public IndividualUserAddUserManager(IAuthUsersAdminService authUsersAdmin, IAuth
     /// <returns>status, with error if there an user already</returns>
     public async Task<IStatusGeneric> CheckNoExistingAuthUserAsync(AddNewUserDto newUser)
     {
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
         if ((await _authUsersAdmin.FindAuthUserByEmailAsync(newUser.Email))?.Result != null)
             return status.AddErrorString("ExistingUser".ClassLocalizeKey(this, true),
             "There is already an AuthUser with your email, so you can't add another.",
@@ -83,7 +83,7 @@ public async Task<IStatusGeneric> SetUserInfoAsync(AddNewUserDto newUser)
     {
         UserLoginData = newUser ?? throw new ArgumentNullException(nameof(newUser));
 
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
         status.SetMessageString("SuccessAddUser".ClassLocalizeKey(this, true),
             "New user with claims added");
 
diff --git a/AuthPermissions.SupportCode/ShardingServices/AccessDatabaseInformation.cs b/AuthPermissions.SupportCode/ShardingServices/AccessDatabaseInformation.cs
@@ -106,7 +106,7 @@ public IStatusGeneric UpdateDatabaseInfoToJsonFile(DatabaseInformation databaseI
     {
         return ApplyChangeWithinDistributedLock(() =>
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             var fileContent = ReadShardingSettingsFile();
             var foundIndex = fileContent.FindIndex(x => x.Name == databaseInfo.Name);
             if (foundIndex == -1)
@@ -128,7 +128,7 @@ public async Task<IStatusGeneric> RemoveDatabaseInfoToJsonFileAsync(string datab
     {
         return await ApplyChangeWithinDistributedLockAsync(async () =>
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             var fileContent = ReadShardingSettingsFile();
             var foundIndex = fileContent.FindIndex(x => x.Name == databaseInfoName);
             if (foundIndex == -1)
@@ -152,7 +152,7 @@ public async Task<IStatusGeneric> RemoveDatabaseInfoToJsonFileAsync(string datab
 
     private IStatusGeneric CheckDatabasesInfoAndSaveIfValid(List<DatabaseInformation> databasesInfo, DatabaseInformation changedInfo)
     {
-        var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+        var status = new StatusGenericLocalizer(_localizeDefault);
         status.SetMessageFormatted("SuccessUpdate".ClassLocalizeKey(this, true),
         $"Successfully updated the {ShardingSettingFilename} with your changes.");
 
diff --git a/AuthPermissions/AdminCode/Services/AuthRolesAdminService.cs b/AuthPermissions/AdminCode/Services/AuthRolesAdminService.cs
@@ -111,7 +111,7 @@ public async Task<IStatusGeneric> CreateRoleToPermissionsAsync(string roleName,
             IEnumerable<string> permissionNames,
             string description, RoleTypes roleType = RoleTypes.Normal)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             status.SetMessageFormatted("Success".ClassMethodLocalizeKey(this, true), 
                 $"Successfully added the new role {roleName}.");
 
@@ -156,7 +156,7 @@ public async Task<IStatusGeneric> UpdateRoleToPermissionsAsync(string roleName,
             IEnumerable<string> permissionNames,
             string description, RoleTypes roleType = RoleTypes.Normal)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             status.SetMessageFormatted("Success".ClassMethodLocalizeKey(this, true),
                 $"Successfully updated the role {roleName}.");
             var existingRolePermission = await _context.RoleToPermissions.SingleOrDefaultAsync(x => x.RoleName == roleName);
@@ -186,7 +186,7 @@ public async Task<IStatusGeneric> UpdateRoleToPermissionsAsync(string roleName,
                 //We need to check that the new RoleType matches where they are used
                 var roleChecker = new ChangeRoleTypeChecks(_context);
                 if (status.CombineStatuses(
-                        await roleChecker.CheckRoleTypeChangeAsync(originalRoleType, roleType,roleName)).HasErrors)
+                        await roleChecker.CheckRoleTypeChangeAsync(originalRoleType, roleType,roleName, _localizeDefault)).HasErrors)
                     return status;
             }
 
@@ -206,7 +206,7 @@ await roleChecker.CheckRoleTypeChangeAsync(originalRoleType, roleType,roleName))
         /// <returns>status</returns>
         public async Task<IStatusGeneric> DeleteRoleAsync(string roleName, bool removeFromUsers)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
 
             var existingRolePermission =
                 await _context.RoleToPermissions.SingleOrDefaultAsync(x => x.RoleName == roleName);
diff --git a/AuthPermissions/AdminCode/Services/AuthTenantAdminService.cs b/AuthPermissions/AdminCode/Services/AuthTenantAdminService.cs
@@ -380,7 +380,7 @@ public async Task<IStatusGeneric> UpdateTenantNameAsync(int tenantId, string new
 
             if (string.IsNullOrEmpty(newTenantName))
                 return status.AddErrorString("TenantNameEmpty".ClassMethodLocalizeKey(this, true),
-                    "The new name was empty.", nameof(newTenantName).CamelToPascal());
+                    "The new tenant name was empty.", nameof(newTenantName).CamelToPascal());
             if (newTenantName.Contains('|'))
                 return status.AddErrorString("NameBadChar".ClassLocalizeKey(this, true), //common error in this class
                                     "The tenant name must not contain the character '|' because that character is used to separate the names in the hierarchical order",
@@ -488,7 +488,8 @@ public async Task<IStatusGeneric> MoveHierarchicalTenantToAnotherParentAsync(int
                                                     "Could not find the parent tenant you asked for.");
 
                     if (tenantsWithChildren.Select(x => x.TenantFullName).Contains(parentTenant.TenantFullName))
-                        return status.AddErrorString("ParentIsChild".ClassMethodLocalizeKey(this, true), "You cannot move a tenant one of its children.",
+                        return status.AddErrorString("ParentIsChild".ClassMethodLocalizeKey(this, true), 
+                            "You cannot move a tenant one of its children.",
                             nameof(newParentTenantId).CamelToPascal());
                 }
 
@@ -722,7 +723,7 @@ public async Task<IStatusGeneric> MoveToDifferentDatabaseAsync(int tenantToMoveI
         /// <returns>status</returns>
         private async Task<IStatusGeneric> CheckHasOwnDbIsValidAsync(bool hasOwnDb, string databaseInfoName)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             if (!hasOwnDb)
                 return status;
 
diff --git a/AuthPermissions/AdminCode/Services/AuthUsersAdminService.cs b/AuthPermissions/AdminCode/Services/AuthUsersAdminService.cs
@@ -132,7 +132,7 @@ public async Task<IStatusGeneric<AuthUser>> FindAuthUserByEmailAsync(string emai
         public async Task<IStatusGeneric> UpdateDisabledAsync(string userId, bool isDisabled)
         {
             if (userId == null) throw new ArgumentNullException(nameof(userId));
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             status.SetMessageFormatted("Success".ClassMethodLocalizeKey(this, true),
                 $"Successfully changed the user's {nameof(AuthUser.IsDisabled)} to {isDisabled}.");
 
@@ -222,7 +222,7 @@ public async Task<List<string>> GetAllTenantNamesAsync()
         public async Task<IStatusGeneric> AddNewUserAsync(string userId, string email,
             string userName, List<string> roleNames, string tenantName = null)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             status.SetMessageFormatted("Success".ClassMethodLocalizeKey(this, true),
                 $"Successfully added a AuthUser with the name '{userName ?? email}'.");
 
@@ -274,7 +274,7 @@ public async Task<IStatusGeneric> UpdateUserAsync(string userId,
         {
             if (userId == null) throw new ArgumentNullException(nameof(userId));
 
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
             
             var foundUserStatus = await FindAuthUserByUserIdAsync(userId);
             if (status.CombineStatuses(foundUserStatus).HasErrors)
@@ -347,7 +347,7 @@ await _context.Entry(foundTenant)
         /// <returns>status</returns>
         public async Task<IStatusGeneric> DeleteUserAsync(string userId)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
 
             var authUser = await _context.AuthUsers.SingleOrDefaultAsync(x => x.UserId == userId);
 
@@ -418,7 +418,7 @@ public async Task<List<SyncAuthUserWithChange>> SyncAndShowChangesAsync()
         /// <returns>Status</returns>
         public async Task<IStatusGeneric> ApplySyncChangesAsync(IEnumerable<SyncAuthUserWithChange> changesToApply)
         {
-            var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);
+            var status = new StatusGenericLocalizer(_localizeDefault);
 
             foreach (var syncChange in changesToApply)
             {
diff --git a/AuthPermissions/AdminCode/Services/Internal/ChangeRoleTypeChecks.cs b/AuthPermissions/AdminCode/Services/Internal/ChangeRoleTypeChecks.cs
diff --git a/AuthPermissions/BulkLoadServices/Concrete/BulkLoadTenantsService.cs b/AuthPermissions/BulkLoadServices/Concrete/BulkLoadTenantsService.cs
diff --git a/AuthPermissions/BulkLoadServices/Concrete/BulkLoadUsersService.cs b/AuthPermissions/BulkLoadServices/Concrete/BulkLoadUsersService.cs

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public async Task LogoutUserViaRefreshTokenAsync(string refreshToken)`
`43`	`43`	`if (latestValidRefreshToken != null)`
`44`	`44`	`{`
`45`	`45`	`latestValidRefreshToken.MarkAsInvalid();`
`46`		`- var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());`
	`46`	`+ var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());`
`47`	`47`	`status.IfErrorsTurnToException();`
`48`	`48`	`}`
`49`	`49`	`}`
`@@ -61,7 +61,7 @@ public async Task LogoutUserViaUserIdAsync(string userId)`
`61`	`61`	`.ToListAsync();`
`62`	`62`
`63`	`63`	`latestValidRefreshTokens.ForEach(x => x.MarkAsInvalid());`
`64`		`- var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer<ResourceLocalize>());`
	`64`	`+ var status = await _context.SaveChangesWithChecksAsync(new StubDefaultLocalizer());`
`65`	`65`	`status.IfErrorsTurnToException();`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public string FormConnectionString(string databaseInfoName)`
`156`	`156`	`/// <exception cref="ArgumentNullException"></exception>`
`157`	`157`	`public IStatusGeneric TestFormingConnectionString(DatabaseInformation databaseInfo)`
`158`	`158`	`{`
`159`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);`
	`159`	`+ var status = new StatusGenericLocalizer(_localizeDefault);`
`160`	`160`
`161`	`161`	`if (databaseInfo == null)`
`162`	`162`	`throw new ArgumentNullException(nameof(databaseInfo));`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private enum ExceptionTypes {Duplicate, ConcurrencyError}`
`74`	`74`	`private static IStatusGeneric ConvertExceptionToStatus(this IReadOnlyList<EntityEntry> entities,`
`75`	`75`	`ExceptionTypes exceptionType, IDefaultLocalizer localizeDefault)`
`76`	`76`	`{`
`77`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(localizeDefault);`
	`77`	`+ var status = new StatusGenericLocalizer(localizeDefault);`
`78`	`78`
`79`	`79`	`//NOTE: These is only one entity in an exception`
`80`	`80`	`if (entities.Any())`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public AzureAdNewUserManager(IAuthUsersAdminService authUsersAdmin, IAuthTenantA`
`63`	`63`	`/// <returns>status, with error if there an user already</returns>`
`64`	`64`	`public async Task<IStatusGeneric> CheckNoExistingAuthUserAsync(AddNewUserDto newUser)`
`65`	`65`	`{`
`66`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);`
	`66`	`+ var status = new StatusGenericLocalizer(_localizeDefault);`
`67`	`67`	`if ((await _authUsersAdmin.FindAuthUserByEmailAsync(newUser.Email))?.Result != null)`
`68`	`68`	`return status.AddErrorString("ExistingUser".ClassLocalizeKey(this, true),`
`69`	`69`	`"There is already an AuthUser with your email, so you can't add another.",`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public IStatusGeneric UpdateDatabaseInfoToJsonFile(DatabaseInformation databaseI`
`106`	`106`	`{`
`107`	`107`	`return ApplyChangeWithinDistributedLock(() =>`
`108`	`108`	`{`
`109`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);`
	`109`	`+ var status = new StatusGenericLocalizer(_localizeDefault);`
`110`	`110`	`var fileContent = ReadShardingSettingsFile();`
`111`	`111`	`var foundIndex = fileContent.FindIndex(x => x.Name == databaseInfo.Name);`
`112`	`112`	`if (foundIndex == -1)`
`@@ -128,7 +128,7 @@ public async Task<IStatusGeneric> RemoveDatabaseInfoToJsonFileAsync(string datab`
`128`	`128`	`{`
`129`	`129`	`return await ApplyChangeWithinDistributedLockAsync(async () =>`
`130`	`130`	`{`
`131`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);`
	`131`	`+ var status = new StatusGenericLocalizer(_localizeDefault);`
`132`	`132`	`var fileContent = ReadShardingSettingsFile();`
`133`	`133`	`var foundIndex = fileContent.FindIndex(x => x.Name == databaseInfoName);`
`134`	`134`	`if (foundIndex == -1)`
`@@ -152,7 +152,7 @@ public async Task<IStatusGeneric> RemoveDatabaseInfoToJsonFileAsync(string datab`
`152`	`152`
`153`	`153`	`private IStatusGeneric CheckDatabasesInfoAndSaveIfValid(List<DatabaseInformation> databasesInfo, DatabaseInformation changedInfo)`
`154`	`154`	`{`
`155`		`- var status = new StatusGenericLocalizer<ResourceLocalize>(_localizeDefault);`
	`155`	`+ var status = new StatusGenericLocalizer(_localizeDefault);`
`156`	`156`	`status.SetMessageFormatted("SuccessUpdate".ClassLocalizeKey(this, true),`
`157`	`157`	`$"Successfully updated the {ShardingSettingFilename} with your changes.");`
`158`	`158`