square-authentication 3.0.0__py3-none-any.whl → 4.0.1__py3-none-any.whl

square_authentication/pydantic_models/core.py

@@ -13,6 +13,7 @@ class LoginUsernameV0(BaseModel):
     username: str
     password: str
     app_id: int
+    assign_app_id_if_missing: bool = False
 
 
 class DeleteUserV0(BaseModel):

square_authentication/routes/core.py

@@ -5,12 +5,13 @@ import bcrypt
 import jwt
 from fastapi import APIRouter, status, Header, HTTPException
 from fastapi.responses import JSONResponse
+from requests import HTTPError
 from square_commons import get_api_output_in_standard_format
-from square_database.pydantic_models.pydantic_models import (
+from square_database_helper.main import SquareDatabaseHelper
+from square_database_helper.pydantic_models import (
     FiltersV0,
     FilterConditionsV0,
 )
-from square_database_helper.main import SquareDatabaseHelper
 from square_database_structure.square import global_string_database_name
 from square_database_structure.square.authentication import global_string_schema_name
 from square_database_structure.square.authentication.tables import (
@@ -79,7 +80,7 @@ async def register_username_v0(
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserCredential.user_credential_username.name: FilterConditionsV0(
                         eq=username
                     )
@@ -222,7 +223,7 @@ async def register_username_v0(
                 schema_name=global_string_schema_name,
                 table_name=User.__tablename__,
                 filters=FiltersV0(
-                    {User.user_id.name: FilterConditionsV0(eq=local_str_user_id)}
+                    root={User.user_id.name: FilterConditionsV0(eq=local_str_user_id)}
                 ),
             )
         output_content = get_api_output_in_standard_format(
@@ -264,7 +265,9 @@ async def get_user_details_v0(
             database_name=global_string_database_name,
             schema_name=global_string_schema_name,
             table_name=UserApp.__tablename__,
-            filters=FiltersV0({UserApp.user_id.name: FilterConditionsV0(eq=user_id)}),
+            filters=FiltersV0(
+                root={UserApp.user_id.name: FilterConditionsV0(eq=user_id)}
+            ),
         )["data"]["main"]
         local_list_response_user_credentials = (
             global_object_square_database_helper.get_rows_v0(
@@ -272,19 +275,21 @@ async def get_user_details_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserCredential.__tablename__,
                 filters=FiltersV0(
-                    {UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
+                    root={UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
                 ),
             )["data"]["main"]
         )
-        # not putting filter for expiry refresh tokens
         local_list_response_user_sessions = (
             global_object_square_database_helper.get_rows_v0(
                 database_name=global_string_database_name,
                 schema_name=global_string_schema_name,
                 table_name=UserSession.__tablename__,
                 filters=FiltersV0(
-                    {
+                    root={
                         UserSession.user_id.name: FilterConditionsV0(eq=user_id),
+                        UserSession.user_session_expiry_time.name: FilterConditionsV0(
+                            gte=datetime.now(timezone.utc).isoformat()
+                        ),
                     }
                 ),
             )["data"]["main"]
@@ -303,7 +308,7 @@ async def get_user_details_v0(
             "sessions": [
                 {
                     "app_id": x[UserApp.app_id.name],
-                    "sessions": len(
+                    "active_sessions": len(
                         [
                             y
                             for y in local_list_response_user_sessions
@@ -390,7 +395,7 @@ async def update_user_app_ids_v0(
             schema_name=global_string_public_schema_name,
             table_name=App.__tablename__,
             apply_filters=False,
-            filters=FiltersV0({}),
+            filters=FiltersV0(root={}),
         )["data"]["main"]
         local_list_invalid_ids = [
             x
@@ -414,7 +419,9 @@ async def update_user_app_ids_v0(
             database_name=global_string_database_name,
             schema_name=global_string_schema_name,
             table_name=UserApp.__tablename__,
-            filters=FiltersV0({UserApp.user_id.name: FilterConditionsV0(eq=user_id)}),
+            filters=FiltersV0(
+                root={UserApp.user_id.name: FilterConditionsV0(eq=user_id)}
+            ),
         )["data"]["main"]
         local_list_new_app_ids = [
             {
@@ -439,7 +446,7 @@ async def update_user_app_ids_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserApp.__tablename__,
                 filters=FiltersV0(
-                    {
+                    root={
                         UserApp.user_id.name: FilterConditionsV0(eq=user_id),
                         UserApp.app_id.name: FilterConditionsV0(eq=app_id),
                     }
@@ -451,7 +458,7 @@ async def update_user_app_ids_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserSession.__tablename__,
                 filters=FiltersV0(
-                    {
+                    root={
                         UserSession.user_id.name: FilterConditionsV0(eq=user_id),
                         UserSession.app_id.name: FilterConditionsV0(eq=app_id),
                     }
@@ -466,7 +473,9 @@ async def update_user_app_ids_v0(
             database_name=global_string_database_name,
             schema_name=global_string_schema_name,
             table_name=UserApp.__tablename__,
-            filters=FiltersV0({UserApp.user_id.name: FilterConditionsV0(eq=user_id)}),
+            filters=FiltersV0(
+                root={UserApp.user_id.name: FilterConditionsV0(eq=user_id)}
+            ),
         )["data"]["main"]
         output_content = get_api_output_in_standard_format(
             message=messages["GENERIC_UPDATE_SUCCESSFUL"],
@@ -497,12 +506,13 @@ async def update_user_app_ids_v0(
         )
 
 
-@router.get("/login_username/v0")
+@router.post("/login_username/v0")
 @global_object_square_logger.async_auto_logger
 async def login_username_v0(body: LoginUsernameV0):
     username = body.username
     password = body.password
     app_id = body.app_id
+    assign_app_id_if_missing = body.assign_app_id_if_missing
     username = username.lower()
     try:
         """
@@ -514,7 +524,7 @@ async def login_username_v0(body: LoginUsernameV0):
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserCredential.user_credential_username.name: FilterConditionsV0(
                         eq=username
                     )
@@ -542,20 +552,42 @@ async def login_username_v0(body: LoginUsernameV0):
             schema_name=global_string_schema_name,
             table_name=UserApp.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserApp.user_id.name: FilterConditionsV0(eq=local_str_user_id),
                     UserApp.app_id.name: FilterConditionsV0(eq=app_id),
                 }
             ),
         )["data"]["main"]
-        if len(local_list_user_app_response) != 1:
-            output_content = get_api_output_in_standard_format(
-                message=messages["GENERIC_400"],
-                log=f"user_id {local_str_user_id}({username}) not assigned to app {app_id}.",
-            )
-            return JSONResponse(
-                status_code=status.HTTP_400_BAD_REQUEST, content=output_content
-            )
+        if len(local_list_user_app_response) == 0:
+            if assign_app_id_if_missing:
+                try:
+                    global_object_square_database_helper.insert_rows_v0(
+                        database_name=global_string_database_name,
+                        schema_name=global_string_schema_name,
+                        table_name=UserApp.__tablename__,
+                        data=[
+                            {
+                                UserApp.user_id.name: local_str_user_id,
+                                UserApp.app_id.name: app_id,
+                            }
+                        ],
+                    )
+                except HTTPError as he:
+                    output_content = get_api_output_in_standard_format(
+                        message=messages["GENERIC_400"],
+                        log=str(he),
+                    )
+                    return JSONResponse(
+                        status_code=he.response.status_code, content=output_content
+                    )
+            else:
+                output_content = get_api_output_in_standard_format(
+                    message=messages["GENERIC_400"],
+                    log=f"user_id {local_str_user_id}({username}) not assigned to app {app_id}.",
+                )
+                return JSONResponse(
+                    status_code=status.HTTP_400_BAD_REQUEST, content=output_content
+                )
 
         # validate password
         if not (
@@ -673,7 +705,7 @@ async def generate_access_token_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserSession.__tablename__,
                 filters=FiltersV0(
-                    {
+                    root={
                         UserSession.user_session_refresh_token.name: FilterConditionsV0(
                             eq=refresh_token
                         ),
@@ -763,7 +795,7 @@ async def logout_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserSession.__tablename__,
                 filters=FiltersV0(
-                    {
+                    root={
                         UserSession.user_session_refresh_token.name: FilterConditionsV0(
                             eq=refresh_token
                         ),
@@ -807,7 +839,7 @@ async def logout_v0(
             schema_name=global_string_schema_name,
             table_name=UserSession.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserSession.user_session_refresh_token.name: FilterConditionsV0(
                         eq=refresh_token
                     ),
@@ -870,7 +902,7 @@ async def update_username_v0(
             schema_name=global_string_schema_name,
             table_name=User.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     User.user_id.name: FilterConditionsV0(eq=user_id),
                 }
             ),
@@ -892,7 +924,7 @@ async def update_username_v0(
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserCredential.user_credential_username.name: FilterConditionsV0(
                         eq=new_username
                     ),
@@ -921,7 +953,7 @@ async def update_username_v0(
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserCredential.user_id.name: FilterConditionsV0(eq=user_id),
                 }
             ),
@@ -988,7 +1020,7 @@ async def delete_user_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserCredential.__tablename__,
                 filters=FiltersV0(
-                    {UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
+                    root={UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
                 ),
             )["data"]["main"]
         )
@@ -1028,7 +1060,7 @@ async def delete_user_v0(
             schema_name=global_string_schema_name,
             table_name=User.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     User.user_id.name: FilterConditionsV0(eq=user_id),
                 }
             ),
@@ -1093,7 +1125,7 @@ async def update_password_v0(
                 schema_name=global_string_schema_name,
                 table_name=UserCredential.__tablename__,
                 filters=FiltersV0(
-                    {UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
+                    root={UserCredential.user_id.name: FilterConditionsV0(eq=user_id)}
                 ),
             )["data"]["main"]
         )
@@ -1136,7 +1168,7 @@ async def update_password_v0(
             schema_name=global_string_schema_name,
             table_name=UserCredential.__tablename__,
             filters=FiltersV0(
-                {
+                root={
                     UserCredential.user_id.name: FilterConditionsV0(eq=user_id),
                 }
             ),

{square_authentication-3.0.0.dist-info → square_authentication-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: square-authentication
-Version: 3.0.0
+Version: 4.0.1
 Summary: authentication layer for my personal server.
 Home-page: https://github.com/thepmsquare/square_authentication
 Author: thePmSquare
@@ -43,6 +43,16 @@ pip install square_authentication
 
 ## changelog
 
+### v4.0.1
+
+- bugfix in pydantic model import.
+
+### v4.0.0
+
+- /login_username/v0 is now POST method.
+- new flag in /login_username/v0 assign_app_id_if_missing.
+- bugfix: /get_user_details/v0 now only returns number of active sessions.
+
 ### v3.0.0
 
 - added new endpoints

{square_authentication-3.0.0.dist-info → square_authentication-4.0.1.dist-info}/RECORD

@@ -4,14 +4,14 @@ square_authentication/main.py,sha256=JK9KBmN73KL8EpKrXrjrwwf37bmC4AXrFHtfl2roYwQ
 square_authentication/messages.py,sha256=BA9KC0vW9UD1ZXT4VneVqVNLlgdbMdsAwAgxhJISLf4,1175
 square_authentication/data/config.ini,sha256=_740RvKpL5W2bUDGwZ7ePwuP-mAasr5cXXB81yq_Jv8,906
 square_authentication/pydantic_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_authentication/pydantic_models/core.py,sha256=Bd6BPFPCV5PPA0KDKXUghIpoQA_w9MCSMY6ldSxM1qw,388
+square_authentication/pydantic_models/core.py,sha256=Hwzr-YJH6GVGLp4Z29iHItOEhiEvk65MjsttmCaDTe4,431
 square_authentication/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-square_authentication/routes/core.py,sha256=ijTmFDi8wg0oFycQRqxpXk4j4t6IqXq0FHffjecAnkQ,43303
+square_authentication/routes/core.py,sha256=Yki554LnBEv1RkwwPkSTksCbXMtgheka4_No41XVbe0,44742
 square_authentication/routes/utility.py,sha256=Kx4S4tZ1GKsPoC8CoZ4fkLEebvr02KeFEPePtTHtpnQ,75
 square_authentication/utils/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 square_authentication/utils/encryption.py,sha256=T6BShoUr_xeGpbfPgTK-GxTlXPwcjwU4c4KW7KPzrF8,1865
 square_authentication/utils/token.py,sha256=Y_arg5LegX-aprMj9YweUK8jjNZLGDjLUGgxbUA12w4,560
-square_authentication-3.0.0.dist-info/METADATA,sha256=6ahIoM0u8VAAGmp48nmRWwNMBj9tnN5X2q8oMr-G3Tc,2622
-square_authentication-3.0.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-square_authentication-3.0.0.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
-square_authentication-3.0.0.dist-info/RECORD,,
+square_authentication-4.0.1.dist-info/METADATA,sha256=jJswgaCL5ieluh7o0KkQ4THyr0FlaKdc57-1hQNfttA,2858
+square_authentication-4.0.1.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+square_authentication-4.0.1.dist-info/top_level.txt,sha256=wDssVJIl9KIEJPj5rR3rv4uRI7yCndMBrvHd_6BGXQA,22
+square_authentication-4.0.1.dist-info/RECORD,,

{square_authentication-3.0.0.dist-info → square_authentication-4.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py3-none-any