Changeset 404 for binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs

Timestamp:

Feb 16, 2023, 3:50:53 PM (21 months ago)

Author:

alloc

Message:

Latest state including reworking to the permissions system

File:

• binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs (modified) (4 diffs)

binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs

@@ -3 +3 @@
 using System.Net;
 using System.Reflection;
+using Webserver.Permissions;
 using Webserver.WebAPI;
 
@@ -10 +11 @@
 
                 public ApiHandler () : base (null) {
-
                 }
+                
+                private static readonly Type[] apiWithParentCtorTypes = { typeof (Web) };
+                private static readonly object[] apiWithParentCtorArgs = new object[1];
+                private static readonly Type[] apiEmptyCtorTypes = { };
+                private static readonly object[] apiEmptyCtorArgs = { };
 
                 public override void SetBasePathAndParent (Web _parent, string _relativePath) {
                         base.SetBasePathAndParent (_parent, _relativePath);
 
-                        Type[] apiWithParentCtorTypes = { typeof (Web) };
-                        object[] apiWithParentCtorArgs = { _parent };
+                        apiWithParentCtorArgs[0] = _parent;
 
-                        Type[] apiEmptyCtorTypes = { };
-                        object[] apiEmptyCtorArgs = { };
-                        
-                        
-                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsWebAPI), _type => {
-                                ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes);
-                                if (ctor != null) {
-                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiWithParentCtorArgs);
-                                        addApi (apiInstance);
-                                        return;
-                                }
-                                        
-                                ctor = _type.GetConstructor (apiEmptyCtorTypes);
-                                if (ctor != null) {
-                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiEmptyCtorArgs);
-                                        addApi (apiInstance);
-                                }
-                        });
+                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsWebAPI), apiFoundCallback);
 
                         // Permissions that don't map to a real API
@@ -43 +30 @@
                 }
 
+                private void apiFoundCallback (Type _type) {
+                        ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes);
+                        if (ctor != null) {
+                                AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiWithParentCtorArgs);
+                                addApi (apiInstance);
+                                return;
+                        }
+
+                        ctor = _type.GetConstructor (apiEmptyCtorTypes);
+                        if (ctor != null) {
+                                AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiEmptyCtorArgs);
+                                addApi (apiInstance);
+                        }
+                }
+
                 private void addApi (AbsWebAPI _api) {
                         apis.Add (_api.Name, _api);
-                        WebPermissions.Instance.AddKnownModule ($"webapi.{_api.Name}", _api.DefaultPermissionLevel ());
+                        AdminWebModules.Instance.AddKnownModule ($"webapi.{_api.Name}", _api.DefaultPermissionLevel ());
                 }
 
@@ -92 +94 @@
 
                 private bool IsAuthorizedForApi (string _apiName, int _permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ($"webapi.{_apiName}", _permissionLevel);
+                        return AdminWebModules.Instance.ModuleAllowedWithLevel ($"webapi.{_apiName}", _permissionLevel);
                 }
         }