Injection point must be public

mewlist · Feb 21, 2024 · fb562d5 · fb562d5
1 parent 672e3aa
commit fb562d5
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 5 deletions.
diff --git a/Runtime/TargetMethodsInfo.cs b/Runtime/TargetMethodsInfo.cs
@@ -12,20 +12,28 @@ internal class TargetMethodsInfo
 
         public TargetMethodsInfo(Type targetType)
         {
-            foreach (var methodInfo in targetType.GetMethods())
+            foreach (var methodInfo in targetType.GetMethods(BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic))
             {
                 if (methodInfo.GetCustomAttributes(typeof(InjectAttribute), true).Length > 0)
+                {
+                    if (!methodInfo.IsPublic)
+                        throw new Exception($"Inject method must be public. {targetType.Name}.{methodInfo.Name}()");
                     InjectMethods.Add(methodInfo);
+                }
 
                 if (methodInfo.GetCustomAttributes(typeof(PostInjectAttribute), true).Length > 0)
                 {
+                    if (!methodInfo.IsPublic)
+                        throw new Exception($"PostInject method must be public. {targetType.Name}.{methodInfo.Name}()");
                     if (methodInfo.GetParameters().Length > 0)
                         throw new Exception("PostInject method should not have any parameters");
                     PostInjectMethods.Add(methodInfo);
                 }
 
                 if (methodInfo.GetCustomAttributes(typeof(OnInjectedAttribute), true).Length > 0)
                 {
+                    if (!methodInfo.IsPublic)
+                        throw new Exception($"OnInjected method must be public. {targetType.Name}.{methodInfo.Name}()");
                     if (methodInfo.GetParameters().Length > 0)
                         throw new Exception("OnInjected method should not have any parameters");
                     OnInjectedMethods.Add(methodInfo);

diff --git a/Runtime/TargetPropertiesInfo.cs b/Runtime/TargetPropertiesInfo.cs
@@ -10,10 +10,15 @@ internal class TargetPropertiesInfo
 
         public TargetPropertiesInfo(Type targetType)
         {
-            foreach (var propertyInfo in targetType.GetProperties())
+            foreach (var propertyInfo in targetType.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
             {
-                if (propertyInfo.GetCustomAttributes(typeof(InjectAttribute), true).Length > 0)
-                    InjectProperties.Add(propertyInfo);
+                if (propertyInfo.GetCustomAttributes(typeof(InjectAttribute), true).Length <= 0)
+                    continue;
+
+                if (!propertyInfo.CanWrite || !propertyInfo.SetMethod.IsPublic)
+                    throw new Exception($"Property must have a public setter. {targetType.Name}.{propertyInfo.Name}");
+
+                InjectProperties.Add(propertyInfo);
             }
         }
 

diff --git a/Tests/Components/PropertyInjectionComponent.cs b/Tests/Components/PropertyInjectionComponent.cs
@@ -5,6 +5,6 @@ namespace Doinject.Tests
     public class PropertyInjectionComponent : MonoBehaviour, IInjectableComponent
     {
         [Inject]
-        public InjectedObject InjectedObject { get; private set; }
+        public InjectedObject InjectedObject { get; set; }
     }
 }
diff --git a/Tests/Components/PropertyInjectionWithNonPublicSetterComponent.cs b/Tests/Components/PropertyInjectionWithNonPublicSetterComponent.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace Doinject.Tests
+{
+    public class PropertyInjectionWithNonPublicSetterComponent : MonoBehaviour, IInjectableComponent
+    {
+        [Inject]
+        public InjectedObject InjectedObject { get; private set; }
+    }
+}
diff --git a/Tests/Components/PropertyInjectionWithNonPublicSetterComponent.cs.meta b/Tests/Components/PropertyInjectionWithNonPublicSetterComponent.cs.meta
diff --git a/Tests/InjectionTest.cs b/Tests/InjectionTest.cs
@@ -144,5 +144,22 @@ public async Task PropertyInjectionComponentTest()
             var instance = await container.ResolveAsync<PropertyInjectionComponent>();
             Assert.NotNull(instance.InjectedObject);
         }
+
+        [Test]
+        public async Task PropertyInjectionWithNonPublicSetterComponentTest()
+        {
+            container.BindTransient<PropertyInjectionWithNonPublicSetterComponent>();
+            container.BindTransient<InjectedObject>();
+            try
+            {
+                await container.ResolveAsync<PropertyInjectionWithNonPublicSetterComponent>();
+            }
+            catch (Exception e)
+            {
+                Assert.Pass();
+
+            }
+            Assert.Fail();
+        }
     }
 }