AssetManager-V1.0 - Not yet reviewed

Added conf data to env

.env

 MONGO_URI=mongodb://localhost:27017
 DB_NAME=userDB
+
 SERVICE_HOST=0.0.0.0
 SERVICE_PORT=8671
-PROJECT_NAME = AssetManager
-PROJECT_ID = 1256
-base_path = scripts/
-sub_path = log/
-ENCODING_TYPE = utf-8
+
+PROJECT_NAME=AssetManager
+PROJECT_ID=1256
+
+base_path=scripts/
\ No newline at end of file
+sub_path=log/
+
+ENCODING_TYPE=utf-8
\ No newline at end of file

main.py

@@ -6,7 +6,6 @@ Email: arun.uday@knowledgelens.com
 Asset Manager Login For Normal User Login
 ---------------------------------------------------------
 
-
 """
 if __name__ == "__main__":
     from dotenv import load_dotenv

scripts/core/handlers/login_handler.py

@@ -88,8 +88,8 @@ class LoginHandlers:
                 if self.new_user_login(login_data, password):
                     return True, {"message": "new_user", "username": login_data.username, "role": "guest"}
                 else:
-                    return False, {"message": ErrorMessages.ERROR_INVALID_USERNAME,
-                                   "data": {login_data.username, login_data.password}}
+                    return False, {"message": ErrorMessages.ERROR_UNAUTHORIZED_USER_LOGIN,
+                                   "data": {"username": login_data.username}}
             # Check the project id from the request body
             if self.db_user_data["project_id"] != Services.PROJECT_ID or Services.PROJECT_ID != login_data.project_id:
                 return False, {"message": ErrorMessages.ERROR_UNAUTHORIZED_USER_LOGIN, "data": login_data.username}

scripts/log/AssetManagerlog.log

 2023-03-20 14:32:44 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
 2023-03-20 14:39:15 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:05:53 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:06:06 - ERROR  - [AnyIO worker thread:login_default(): 41] - Object of type set is not JSON serializable
+Traceback (most recent call last):
+  File "E:\Git\meta-services\scripts\services\v1\iot_manager_services.py", line 33, in login_default
+    return JSONResponse(content=DefaultFailureResponse(error=data).dict(),
+  File "E:\Git\meta-services\venv\lib\site-packages\starlette\responses.py", line 196, in __init__
+    super().__init__(content, status_code, headers, media_type, background)
+  File "E:\Git\meta-services\venv\lib\site-packages\starlette\responses.py", line 55, in __init__
+    self.body = self.render(content)
+  File "E:\Git\meta-services\venv\lib\site-packages\starlette\responses.py", line 199, in render
+    return json.dumps(
+  File "C:\Users\arun.uday\AppData\Local\Programs\Python\Python39\lib\json\__init__.py", line 234, in dumps
+    return cls(
+  File "C:\Users\arun.uday\AppData\Local\Programs\Python\Python39\lib\json\encoder.py", line 199, in encode
+    chunks = self.iterencode(o, _one_shot=True)
+  File "C:\Users\arun.uday\AppData\Local\Programs\Python\Python39\lib\json\encoder.py", line 257, in iterencode
+    return _iterencode(o, 0)
+  File "C:\Users\arun.uday\AppData\Local\Programs\Python\Python39\lib\json\encoder.py", line 179, in default
+    raise TypeError(f'Object of type {o.__class__.__name__} '
+TypeError: Object of type set is not JSON serializable
+2023-03-20 15:08:19 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:08:44 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:09:21 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:09:36 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671
+2023-03-20 15:10:17 - INFO   - [MainThread:<module>(): 37] - App Starting at 0.0.0.0:8671

scripts/services/v1/iot_manager_services.py

@@ -3,6 +3,7 @@ from fastapi.responses import JSONResponse
 
 from scripts.constants.api import ApiEndPoints
 from scripts.core.handlers.login_handler import LoginHandlers
+from scripts.errors import ErrorMessages
 from scripts.logging.logger import logger
 from scripts.schemas.default_responses import DefaultResponse, DefaultFailureResponse
 from scripts.schemas.login_schema import NormalLogin
@@ -20,11 +21,15 @@ def login_default(login_data: NormalLogin):
         decrypted_password = obj_login_handler.password_decrypt(login_data.password)
         # validating the received inputs empty or not
         response = obj_login_handler.user_data_validation(login_data.username, decrypted_password)
+        # Account is not registered
         if response is not None:
             return JSONResponse(content=DefaultFailureResponse(error=response["message"]).dict(),
                                 status_code=status.HTTP_400_BAD_REQUEST)
         # checking for the account and password matching
         response, data = obj_login_handler.db_password_matching(login_data, decrypted_password)
+        if response is not None and data["message"] == ErrorMessages.ERROR_UNAUTHORIZED_USER_LOGIN:
+            return JSONResponse(content=DefaultFailureResponse(error=data).dict(),
+                                status_code=status.HTTP_404_NOT_FOUND)
         if response is not None:
             return JSONResponse(content=DefaultFailureResponse(error=data).dict(),
                                 status_code=status.HTTP_401_UNAUTHORIZED)