Apikeyid (#168)

* add current api key property

* version

* version

* version

* remove -q

* install wheel package

* clarfications

* fix

Author: felipao-mx

.github/workflows/test.yml

@@ -28,7 +28,10 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: make install-test
+      run: |
+        # corregir https://github.com/cuenca-mx/agave/issues/169
+        pip install -qU pip setuptools wheel
+        make install-test
     - name: Run tests
       run: pytest
 

agave/chalice/rest_api.py

@@ -38,6 +38,10 @@ def current_user_id(self):
     def current_platform_id(self):
         return self.current_request.platform_id
 
+    @property
+    def current_api_key_id(self):
+        return self.current_request.api_key_id
+
     def user_id_filter_required(self):
         """
         This method is required to be implemented with your own business logic.

agave/fastapi/rest_api.py

@@ -42,6 +42,10 @@ def current_user_id(self) -> str:
     def current_platform_id(self) -> str:
         return context['platform_id']
 
+    @property
+    def current_api_key_id(self) -> str:
+        return context['api_key_id']
+
     def user_id_filter_required(self) -> bool:
         return context['user_id_filter_required']
 

agave/version.py

@@ -1 +1 @@
-__version__ = '1.3.3'
+__version__ = '1.4.0'

examples/chalice/blueprints/authed.py

@@ -3,7 +3,11 @@
 
 from chalice import Blueprint
 
-from ...config import TEST_DEFAULT_PLATFORM_ID, TEST_DEFAULT_USER_ID
+from ...config import (
+    TEST_DEFAULT_API_KEY_ID,
+    TEST_DEFAULT_PLATFORM_ID,
+    TEST_DEFAULT_USER_ID,
+)
 
 
 class AuthedBlueprint(Blueprint):
@@ -32,6 +36,7 @@ def authed_handler(*args, **kwargs):
                 # before execute `user_handler` function.
                 self.current_request.user_id = TEST_DEFAULT_USER_ID
                 self.current_request.platform_id = TEST_DEFAULT_PLATFORM_ID
+                self.current_request.api_key_id = TEST_DEFAULT_API_KEY_ID
                 return user_handler(*args, **kwargs)
 
             self._register_handler(  # type: ignore

examples/chalice/resources/accounts.py

@@ -23,6 +23,7 @@ def create(request: AccountRequest) -> Response:
             name=request.name,
             user_id=app.current_user_id,
             platform_id=app.current_platform_id,
+            api_key_id=app.current_api_key_id,
         )
         account.save()
         return Response(account.to_dict(), status_code=201)

examples/config.py

@@ -1,4 +1,6 @@
 TEST_DEFAULT_USER_ID = 'US123456789'
 TEST_DEFAULT_PLATFORM_ID = 'PT123456'
+TEST_DEFAULT_API_KEY_ID = 'AK123456789'
 TEST_SECOND_USER_ID = 'US987654321'
 TEST_SECOND_PLATFORM_ID = 'PT987654321'
+TEST_SECOND_API_KEY_ID = 'AK987654321'

examples/fastapi/middlewares/authed.py

@@ -4,7 +4,11 @@
 from starlette_context import _request_scope_context_storage
 from starlette_context.middleware import ContextMiddleware
 
-from ...config import TEST_DEFAULT_PLATFORM_ID, TEST_DEFAULT_USER_ID
+from ...config import (
+    TEST_DEFAULT_API_KEY_ID,
+    TEST_DEFAULT_PLATFORM_ID,
+    TEST_DEFAULT_USER_ID,
+)
 
 
 class AuthedMiddleware(ContextMiddleware):
@@ -38,6 +42,7 @@ async def authenticate(self):
             dict(
                 user_id=TEST_DEFAULT_USER_ID,
                 platform_id=TEST_DEFAULT_PLATFORM_ID,
+                api_key_id=TEST_DEFAULT_API_KEY_ID,
             )
         )
 

examples/fastapi/resources/accounts.py

@@ -30,6 +30,7 @@ async def create(request: AccountRequest) -> Response:
             name=request.name,
             user_id=app.current_user_id,
             platform_id=app.current_platform_id,
+            api_key_id=app.current_api_key_id,
         )
         await account.async_save()
         return Response(content=account.to_dict(), status_code=201)

examples/models/accounts.py

@@ -9,5 +9,6 @@ class Account(BaseModel, AsyncDocument):
     name = StringField(required=True)
     user_id = StringField(required=True)
     platform_id = StringField(required=True)
+    api_key_id = StringField(required=True)
     created_at = DateTimeField()
     deactivated_at = DateTimeField()