Changing the lookup of PluginGroupPermissions, so we use the ClaimName instead of a Id, which can change from deployment to deployment, where as the ClaimName does not.

renemadsen · renemadsen · commit 430f796a1ea9 · 2025-01-21T07:40:44.000+01:00
diff --git a/eFormApi.BasePn/Infrastructure/Helpers/PluginPermissionsManager.cs b/eFormApi.BasePn/Infrastructure/Helpers/PluginPermissionsManager.cs
@@ -83,19 +83,24 @@ public async Task SetPluginGroupPermissions(ICollection<PluginGroupPermissionsLi
             {
                 foreach (var permissionModel in groupPermissionModel.Permissions)
                 {
-                    var pluginGroupPermission = await _dbContext.PluginGroupPermissions
+                    var pluginGroupPermissionResult = await _dbContext.PluginGroupPermissions
+                        .Join(_dbContext.PluginPermissions, pgp => pgp.PermissionId, p => p.Id,
+                            (pgp, p) => new { pgp.GroupId, pgp.PermissionId, pgp.WorkflowState, pgp.IsEnabled, p.ClaimName })
                         .FirstOrDefaultAsync(pgp => pgp.GroupId == groupPermissionModel.GroupId
-                            && pgp.PermissionId == permissionModel.PermissionId
+                                                    && pgp.ClaimName == permissionModel.ClaimName
                             && pgp.WorkflowState != Constants.WorkflowStates.Removed);
 
-                    if (pluginGroupPermission != null)
+                    if (pluginGroupPermissionResult != null)
                     {
+                        var pluginGroupPermission = await _dbContext.PluginGroupPermissions
+                            .FirstAsync(x => x.GroupId == groupPermissionModel.GroupId
+                                                 && x.PermissionId == pluginGroupPermissionResult.PermissionId);
                         pluginGroupPermission.IsEnabled = permissionModel.IsEnabled;
                         pluginGroupPermission.Update(_dbContext);
                     }
                     else
                     {
-                        pluginGroupPermission = new PluginGroupPermission
+                        var pluginGroupPermission = new PluginGroupPermission
                         {
                             GroupId = groupPermissionModel.GroupId,
                             PermissionId = permissionModel.PermissionId,

Original file line number	Diff line number	Diff line change
`@@ -83,19 +83,24 @@ public async Task SetPluginGroupPermissions(ICollection<PluginGroupPermissionsLi`
`83`	`83`	`{`
`84`	`84`	`foreach (var permissionModel in groupPermissionModel.Permissions)`
`85`	`85`	`{`
`86`		`- var pluginGroupPermission = await _dbContext.PluginGroupPermissions`
	`86`	`+ var pluginGroupPermissionResult = await _dbContext.PluginGroupPermissions`
	`87`	`+ .Join(_dbContext.PluginPermissions, pgp => pgp.PermissionId, p => p.Id,`
	`88`	`+ (pgp, p) => new { pgp.GroupId, pgp.PermissionId, pgp.WorkflowState, pgp.IsEnabled, p.ClaimName })`
`87`	`89`	`.FirstOrDefaultAsync(pgp => pgp.GroupId == groupPermissionModel.GroupId`
`88`		`- && pgp.PermissionId == permissionModel.PermissionId`
	`90`	`+ && pgp.ClaimName == permissionModel.ClaimName`
`89`	`91`	`&& pgp.WorkflowState != Constants.WorkflowStates.Removed);`
`90`	`92`
`91`		`- if (pluginGroupPermission != null)`
	`93`	`+ if (pluginGroupPermissionResult != null)`
`92`	`94`	`{`
	`95`	`+ var pluginGroupPermission = await _dbContext.PluginGroupPermissions`
	`96`	`+ .FirstAsync(x => x.GroupId == groupPermissionModel.GroupId`
	`97`	`+ && x.PermissionId == pluginGroupPermissionResult.PermissionId);`
`93`	`98`	`pluginGroupPermission.IsEnabled = permissionModel.IsEnabled;`
`94`	`99`	`pluginGroupPermission.Update(_dbContext);`
`95`	`100`	`}`
`96`	`101`	`else`
`97`	`102`	`{`
`98`		`- pluginGroupPermission = new PluginGroupPermission`
	`103`	`+ var pluginGroupPermission = new PluginGroupPermission`
`99`	`104`	`{`
`100`	`105`	`GroupId = groupPermissionModel.GroupId,`
`101`	`106`	`PermissionId = permissionModel.PermissionId,`