py-auth-micro 0.2.0__tar.gz → 0.2.2__tar.gz

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_auth_micro
-Version: 0.2.0
+Version: 0.2.2
 Summary: A wrapper around pyjwt
 Home-page: https://github.com/bad-microservices/py_auth_micro
 Author: Ole Hannemann

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/Core/_ldap_interactions.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from dataclasses import dataclass
 
 

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/Exceptions/__init__.py

@@ -2,4 +2,3 @@
 
 class AlreadyExists(Exception):
     """An Exception to indicate a given Object already exists and can't be created again"""
-    pass

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/LoginHandler/__init__.py

@@ -60,7 +60,7 @@ async def login(
         password=password,
     )
     if not await login_handler.login():
-        logger.debug(f"Could not log in User '{username}'!")
+        logger.error(f"Could not log in User '{username}'!")
         raise ValueError("could not log in")
     logger.info(f"User '{username}' successfully logged in.")
     return login_handler.user

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/LoginHandler/_loginldap.py

@@ -1,5 +1,5 @@
 try:
-    import ldap # type: ignore
+    import ldap  # type: ignore
 except ImportError:
     pass
 import logging
@@ -9,6 +9,8 @@ from ..Config import LDAPConfig
 from ..Core import LDAPHelper
 from ..Models import User, Group
 
+logger = logging.getLogger(__name__)
+
 
 class LoginLDAP(LoginBaseClass):
     """Login Provider for LDAP/AD Users
@@ -34,7 +36,6 @@ class LoginLDAP(LoginBaseClass):
         Returns:
             bool: Successfull Login
         """
-        logger = logging.getLogger(__name__)
 
         if self.ldap_config is None:
             logger.debug("no ldap_config provided... can't do ldap logins")
@@ -82,9 +83,9 @@ class LoginLDAP(LoginBaseClass):
 
         # add user to group he should be in
         for add_group in add_groups:
-            tmpgr, new = await Group.get_or_create({"name": add_group}, name=add_group)
-            if new:
-                await tmpgr.save()
+            tmpgr = await Group.get_or_none(name=add_group)
+            if tmpgr is None:
+                tmpgr = await Group.create(name=add_group)
             await self.user.groups.add(tmpgr)
 
         # remove user from group he is not a member of anymore

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/LoginHandler/_loginlocal.py

@@ -4,6 +4,8 @@ import logging
 from ..Models import User
 from ._loginbaseclass import LoginBaseClass
 
+logger = logging.getLogger(__name__)
+
 
 class LoginLocal(LoginBaseClass):
     """Login Handler for Local Users
@@ -27,13 +29,10 @@ class LoginLocal(LoginBaseClass):
         Returns:
             bool: Successfull Login
         """
-        logger = logging.getLogger(__name__)
-        logger.debug(f"tyring to login {self.username} Localy")
 
+        logger.debug(f"tyring to login {self.username} Localy")
         pw_hash = self.user.password_hash
-
         pw_matches = bcrypt.checkpw(self.password.encode("utf-8"), pw_hash)
-
         logger.debug(f"PW matches for User '{self.username}': {pw_matches}")
 
         return pw_matches

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/Models/_token.py

@@ -16,6 +16,9 @@ from jwt_helper import SignMethod, JWTEncoder, JWTValidator
 from py_auth_micro.Config import AppConfig
 
 
+logger = logging.getLogger(__name__)
+
+
 class Token(Model):
     """Databse Entity Holding Information around issued Identity Tokens
 
@@ -84,8 +87,8 @@ Valid Options>
         Returns:
             str: The ID-JWT
         """
-        logger = logging.getLogger(__name__)
-        logger.info(f"creating ID-Token JWT with id: {self.token_id}")
+
+        logger.debug(f"creating ID-Token JWT with id: {self.token_id}")
         usergroups = await self.user.groups.all().values_list("name", flat=True)
 
         token = jwt_encoder.create_jwt(
@@ -123,8 +126,7 @@ Valid Options>
         Returns:
             Token: the matched Database Token instance.
         """
-        logger = logging.getLogger(__name__)
-        logger.info(f"verifying ID-Token from {ip}")
+        logger.debug(f"verifying ID-Token from {ip}")
         logger.debug(f"token: {id_jwt}")
         token_content = jwt_validator.get_jwt_as_dict(id_jwt)  # type: dict[str, dict]
 
@@ -150,7 +152,7 @@ Valid Options>
             logger.error("VHost missmatch!")
             raise ValueError("VHost missmatch!")
 
-        logger.info("Token is valid")
+        logger.debug("Token is valid")
         # return the Token from the Database
         return token
 
@@ -167,8 +169,7 @@ Valid Options>
         Returns:
             str: a JWT Token
         """
-        logger = logging.getLogger(__name__)
-        logger.info("creating Access-Token")
+        logger.debug("creating Access-Token")
         usergroups = await (await self.user).groups.all().values_list("name", flat=True)
         logger.debug(f"Token Groups: {usergroups}")
         return jwt_encoder.create_jwt(

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/Models/_user.py

@@ -4,16 +4,13 @@ import datetime
 from typing import Optional
 from tortoise.fields import (
     Field,
-    OneToOneField,
-    BigIntField,
     DatetimeField,
     CharField,
     CharEnumField,
-    OneToOneRelation,
     BinaryField,
     BooleanField,
     ManyToManyField,
-    ReverseRelation,
+    OneToOneRelation
 )
 from tortoise.models import Model
 from jwt_helper import JWTEncoder
@@ -22,6 +19,8 @@ from py_auth_micro.Core import AuthSource
 from py_auth_micro.Config import AppConfig
 from py_auth_micro.Models._token import Token
 
+logger = logging.getLogger(__name__)
+
 
 class User(Model):
     """Model Representing a User
@@ -79,7 +78,7 @@ class User(Model):
         backward_key="name",
     )
 
-    token: ReverseRelation[Token]
+    token: OneToOneRelation[Token]
 
     async def create_id_token(
         self,
@@ -99,8 +98,7 @@ class User(Model):
         Returns:
             Token: _description_
         """
-        logger = logging.getLogger(__name__)
-        logger.info(f"creating token for {self.username}")
+        logger.debug(f"creating token for {self.username}")
         # check if old Token exists
         token = await Token.get_or_none(user=self.username)
 
@@ -133,12 +131,9 @@ class User(Model):
         Returns:
             bool: The Token got revoked.
         """
-        logger = logging.getLogger(__name__)
-        logger.info(f"revoking ID-Token for {self.username}")
+        logger.debug(f"revoking ID-Token for {self.username}")
         if self.token is not None:
-            tokens = await self.token
-            for token in tokens:
-                await token.delete()
+            await self.token.delete()
         return True
 
     def __str__(self):

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro/WorkFlows/_userworkflow.py

@@ -4,7 +4,7 @@ import re
 from dataclasses import dataclass
 from tortoise.exceptions import DoesNotExist
 from jwt_helper import JWTValidator
-from typing import Optional, Union
+from typing import Optional
 
 from py_auth_micro.Models import User
 from py_auth_micro.Exceptions import AlreadyExists
@@ -26,9 +26,7 @@ class UserWorkflow:
     jwt_validator: JWTValidator
     app_cfg: AppConfig
 
-    async def get_all(
-        self, *, access_token: str, **kwargs
-    ) -> dict[str, int | list[str]]:
+    async def get_all(self, *, access_token: str, **kwargs) -> dict:
         """Returns a list of all Usernames.
 
         Args:
@@ -181,34 +179,30 @@ class UserWorkflow:
         if user.username != requesting_user and not is_admin:
             return {"resp_code": 200, "resp_data": user_dict}
 
-        tokens = await user.token
-        # in theory a user could have multiple id tokens
-
         # add groups
         user_dict["groups"] = await user.groups.all().values_list("name", flat=True)
 
-        if tokens is None:
+        token = await user.token
+
+        if token is None:
             user_dict["token_info"] = None
             return {"resp_code": 200, "resp_data": user_dict}
 
-        for token in tokens:
-            # we iterate over array of 1 token to make the typechecker happy
-            user_dict["token_info"] = {
-                "valid_until": token.valid_until.isoformat(),
-                "last_use": token.last_use.isoformat(),
-                "vhost": token.vhost,
-            }
+        user_dict["token_info"] = {
+            "valid_until": token.valid_until.isoformat(),
+            "last_use": token.last_use.isoformat(),
+            "vhost": token.vhost,
+        }
 
         if is_admin:
             user_dict["auth_type"] = user.auth_type.name
-            for token in tokens:
-                user_dict["token_info"].update(
-                    {
-                        "kid": token.token_id,
-                        "ip": token.ip,
-                        "sign_method": token.sign_method.value,
-                    }  # type: ignore
-                )
+            user_dict["token_info"].update(
+                {
+                    "kid": token.token_id,
+                    "ip": token.ip,
+                    "sign_method": token.sign_method.value,
+                }  # type: ignore
+            )
 
         return {"resp_code": 200, "resp_data": user_dict}
 

py_auth_micro-0.2.2/py_auth_micro/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{py_auth_micro-0.2.0 → py_auth_micro-0.2.2}/py_auth_micro.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_auth_micro
-Version: 0.2.0
+Version: 0.2.2
 Summary: A wrapper around pyjwt
 Home-page: https://github.com/bad-microservices/py_auth_micro
 Author: Ole Hannemann

py_auth_micro-0.2.2/setup.py

@@ -0,0 +1,14 @@
+from setuptools import setup
+
+with open("py_auth_micro/_version.py") as infile:
+    version_line = infile.read()
+
+version_line = (
+    version_line.replace("__version__", "")
+    .replace("\n", "")
+    .replace("=", "")
+    .replace(" ", "")
+    .replace(" ", "")
+)
+version = version_line.replace('"', "")
+setup(version=version)

py_auth_micro-0.2.0/py_auth_micro/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"

py_auth_micro-0.2.0/setup.py

@@ -1,13 +0,0 @@
-from setuptools import setup
-with open('py_auth_micro/_version.py') as infile:
-    version_line = infile.read()
-
-version_line = version_line.replace("__version__","")
-version_line = version_line.replace("=","")
-version_line = version_line.replace(" ","")
-version_line = version_line.replace(" ","")
-version = version_line.replace("\"","")
-setup(
-
-    version=version
-)