pluginserver 0.6.0__tar.gz → 0.6.3__tar.gz

{pluginserver-0.6.0/pluginserver.egg-info → pluginserver-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pluginserver
-Version: 0.6.0
+Version: 0.6.3
 Summary: Plugin-driven API server
 Home-page: https://github.com/nicciniamh/pluginserver
 Author: Nicole Stevens

{pluginserver-0.6.0 → pluginserver-0.6.3}/plugincore/baseplugin.py

@@ -1,5 +1,6 @@
+import asyncio
 from aiohttp import web
-import base64
+import inspect
 
 class BasePlugin:
     """
@@ -12,7 +13,9 @@ class BasePlugin:
         self._apikey = None
         self.config = kwargs.get('config')
         self._plugin_id = kwargs.get('route_path',self.__class__.__name__.lower())
-        auth = kwargs.get('auth_type').lower()
+        auth = kwargs.get('auth_type')
+        if auth:
+            auth = auth.lower()
         if auth:
             if auth == 'global':
                 if 'auth' in self.config and 'apikey' in self.config.auth:
@@ -54,7 +57,7 @@ class BasePlugin:
                 toktype='userdata'
             return token
         user_key = get_token(data) or get_custom_header_token(data) or get_user_token(data)
-        print(f"_check_auth: type: {toktype} {self._auth_type} apikey {self._apikey}, args {data}")
+        #print(f"_check_auth: type: {toktype} {self._auth_type} apikey {self._apikey}, args {data}")
 
         if self._auth_type:
             #print(f"Checking {user_key}")
@@ -73,7 +76,9 @@ class BasePlugin:
     async def handle_request(self, **data):
         auth_check = self._check_auth(data)
         if auth_check:
-            code, response = self.request_handler(**data)
+            result = self.request_handler(**data)
+            code, response = await result if inspect.isawaitable(result) else result
+            print(f"Got {code} - {response}")
         else:
             code, response = 403, {'error': 'unauthorized'}
         if not isinstance(response,web.Response):

{pluginserver-0.6.0 → pluginserver-0.6.3/pluginserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pluginserver
-Version: 0.6.0
+Version: 0.6.3
 Summary: Plugin-driven API server
 Home-page: https://github.com/nicciniamh/pluginserver
 Author: Nicole Stevens

{pluginserver-0.6.0 → pluginserver-0.6.3}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='pluginserver',
-    version='0.6.0',
+    version='0.6.3',
     packages=['plugincore'],
     include_package_data=True,
     description='Plugin-driven API server',