Merge pull request #826 from openmod/Change_perms_priority

Change Permssion from lowest to normal
openmod · May 26, 2024 · 2d72650 · 2d72650
2 parents 47aa569 + efd25fa
commit 2d72650
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/framework/OpenMod.Core/Permissions/DefaultPermissionCheckProvider.cs b/framework/OpenMod.Core/Permissions/DefaultPermissionCheckProvider.cs
@@ -11,7 +11,7 @@
 
 namespace OpenMod.Core.Permissions
 {
-    [Priority(Priority = Priority.Lowest)]
+    [Priority(Priority = Priority.Normal)]
     public class DefaultPermissionCheckProvider : IPermissionCheckProvider
     {
         private readonly IPermissionChecker m_PermissionChecker;

diff --git a/framework/OpenMod.Core/Permissions/DefaultPermissionRoleStore.cs b/framework/OpenMod.Core/Permissions/DefaultPermissionRoleStore.cs
@@ -18,7 +18,7 @@ namespace OpenMod.Core.Permissions
 {
     [OpenModInternal]
     [UsedImplicitly]
-    [ServiceImplementation(Priority = Priority.Lowest, Lifetime = ServiceLifetime.Singleton)]
+    [ServiceImplementation(Priority = Priority.Normal, Lifetime = ServiceLifetime.Singleton)]
     public class DefaultPermissionRoleStore : IPermissionRoleStore
     {
         private readonly IPermissionRolesDataStore m_PermissionRolesDataStore;

diff --git a/framework/OpenMod.Core/Permissions/DefaultPermissionStore.cs b/framework/OpenMod.Core/Permissions/DefaultPermissionStore.cs
@@ -8,7 +8,7 @@
 
 namespace OpenMod.Core.Permissions
 {
-    [Priority(Priority = Priority.Lowest)]
+    [Priority(Priority = Priority.Normal)]
     public class DefaultPermissionStore : IPermissionStore
     {
         private readonly IUserDataStore m_UserDataStore;

diff --git a/unturned/OpenMod.Unturned/ServiceConfigurator.cs b/unturned/OpenMod.Unturned/ServiceConfigurator.cs
@@ -3,6 +3,7 @@
 using JetBrainsAnnotations::JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using OpenMod.API;
@@ -99,6 +100,23 @@ public void ConfigureServices(IOpenModServiceConfigurationContext openModStartup
                         options.AddPermissionCheckProvider<RocketCooldownPermissionCheckProvider>();
                     });
 
+
+                    for (int i = 0; i < serviceCollection.Count; i++)
+                    {
+                        var serviceDescriptor = serviceCollection[i];
+                        if (serviceDescriptor.ServiceType != typeof(IPermissionRoleStore))
+                        {
+                            continue;
+                        }
+
+                        if (serviceDescriptor.ImplementationType != typeof(DefaultPermissionRoleStore))
+                        {
+                            continue;
+                        }
+
+                        serviceCollection.RemoveAt(i);
+                    }
+
                     serviceCollection.AddTransient<IPermissionRoleStore, RocketPermissionRoleStore>();
                 }
                 else