ecodev-core 0.0.17__tar.gz → 0.0.19__tar.gz

{ecodev_core-0.0.17 → ecodev_core-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ecodev-core
-Version: 0.0.17
+Version: 0.0.19
 Summary: Low level sqlmodel/fastapi/pydantic building blocks
 License: MIT
 Author: Thomas Epelbaum

{ecodev_core-0.0.17 → ecodev_core-0.0.19}/ecodev_core/__init__.py

@@ -10,6 +10,7 @@ from ecodev_core.app_rights import AppRight
 from ecodev_core.app_user import AppUser
 from ecodev_core.app_user import select_user
 from ecodev_core.app_user import upsert_app_users
+from ecodev_core.app_user import upsert_new_user
 from ecodev_core.auth_configuration import AUTH
 from ecodev_core.authentication import attempt_to_log
 from ecodev_core.authentication import get_access_token
@@ -78,4 +79,4 @@ __all__ = [
     'enum_converter', 'ServerSideFilter', 'get_rows', 'count_rows', 'ServerSideField', 'get_raw_df',
     'generic_insertion', 'custom_equal', 'is_authorized_user', 'get_method', 'AppActivity',
     'fastapi_monitor', 'dash_monitor', 'is_monitoring_user', 'get_recent_activities', 'select_user',
-    'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile']
+    'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile', 'upsert_new_user']

{ecodev_core-0.0.17 → ecodev_core-0.0.19}/ecodev_core/app_user.py

@@ -2,7 +2,7 @@
 Module implementing the sqlmodel orm part of the user table
 """
 from pathlib import Path
-from typing import Dict
+from typing import Any
 from typing import List
 from typing import Optional
 from typing import TYPE_CHECKING
@@ -39,7 +39,7 @@ class AppUser(SQLModel, table=True):  # type: ignore
     rights: List['AppRight'] = Relationship(back_populates='user')
 
 
-def user_convertor(df: pd.DataFrame) -> List[Dict]:
+def user_convertor(df: pd.DataFrame) -> List[Any]:
     """
     Dummy user convertor
     """
@@ -90,3 +90,13 @@ def select_user(username: str, session: Session) -> AppUser:
         sqlalchemy.exc.MultipleResultsFound: Should normally never be an issue.
     """
     return session.exec(select(AppUser).where(col(AppUser.user) == username)).one()
+
+
+def upsert_new_user(user_id: int, user: str, session: Session, password: str = '') -> None:
+    """
+    Upsert a new user if not already present in db
+    """
+    if not session.exec(select(AppUser).where(col(AppUser.id) == user_id)).first():
+        session.add(AppUser(user=user, password=password, permission=Permission.Consultant,
+                            id=user_id))
+        session.commit()

{ecodev_core-0.0.17 → ecodev_core-0.0.19}/ecodev_core/authentication.py

@@ -93,20 +93,23 @@ class JwtAuth(AuthenticationBackend):
             request.session.update(token)
         return True if token else False
 
-    @staticmethod
-    def authorized(form: Any):
+    def authorized(self, form: Any):
         """
         Check that the user information contained in the form corresponds to an admin user
         """
         with Session(engine) as session:
             try:
-                token = attempt_to_log(form.get('username', ''), form.get('password', ''), session)
-                if is_admin_user(token['access_token']):
-                    return token
-                return None
+                return self.admin_token(form, session)
             except HTTPException:
                 return None
 
+    def admin_token(self, form: Any, session: Session) -> Union[Dict[str, str], None]:
+        """
+        Unsafe attempt to retrieve the token, only return it if admin rights
+        """
+        token = attempt_to_log(form.get('username', ''), form.get('password', ''), session)
+        return token if is_admin_user(token['access_token']) else None
+
     async def logout(self, request: Request) -> bool:
         """
         Logout procedure: clears the cache
@@ -238,8 +241,6 @@ def _verify_access_token(token: str,
     """
     try:
         payload = jwt.decode(token, AUTH.secret_key, algorithms=[AUTH.algorithm])
-        log.critical(tfa_value)
-        log.critical(payload.get('tfa'))
         if tfa_check and (not tfa_value or not _check_password(tfa_value, payload.get('tfa'))):
             raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=INVALID_TFA,
                                 headers={'WWW-Authenticate': 'Bearer'})
@@ -264,4 +265,3 @@ def _check_password(plain_password: Optional[str], hashed_password: str) -> bool
     Check the passed password (compare it to the passed encoded one).
     """
     return CONTEXT.verify(plain_password, hashed_password)
-

{ecodev_core-0.0.17 → ecodev_core-0.0.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ecodev-core"
-version = "0.0.17"
+version = "0.0.19"
 description = "Low level sqlmodel/fastapi/pydantic building blocks"
 authors = ["Thomas Epelbaum <tomepel@gmail.com>",
 					 "Olivier Gabriel <olivier.gabriel.geom@gmail.com>",