core data

2025-07-10 19:18:52 -04:00
parent 9b32ed6cd5
commit 69b5e3e3b2
1 changed files with 39 additions and 46 deletions
@@ -92,54 +92,47 @@ class LoginService(BaseService):
    @staticmethod
    def login_user(username, password):
        try:
-            with db.session.begin():
-
-                # validated_data = LoginService.validate_data(data, LoginSchema())
-                # username = validated_data.get('username')
-                # password = validated_data.get('password')
-                member = Members.get_member_by_username(username)
-                # pass22 = generate_password_hash(password)
-                # logger.info("Password generated = >  {}".format(pass22) )
-                if not member:
-                    invalid_data = {
-                        "error_message": "invalid username or password",
-                        "message_key": "invalid_username_or_password",
-                    }
-                    return ResponseHelper.success(data=invalid_data)
-
-                pass_check =  check_password_hash(member.password, password)
-                logger.info("Password check: {}".format(pass_check))
-                if not member or not pass_check:
-                    invalid_data = {
-                        "error_message": "invalid username or password",
-                        "message_key": "invalid_username_or_password",
-                    }
-                    return ResponseHelper.success(data=invalid_data)
-
-                user_data = {}
-                user_data["id"] = member.id,
-                user_data["member_id"]= member.id,
-                user_data["uid"] = str(member.uid),
-
-                user_token = jwt.encode(
-                        {"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)},
-                        Config.JWT_SECRET_KEY,
-                        algorithm="HS256"
-                    )
-
-                # Simulate processing
-                response_data = {
-                    "member_id": member.id,
-                    "uid":  str(member.uid),
-                    "username": member.username,
-                    "account_name": member.account_name,
-                    "firstname":member.firstname,
-                    "lastname": member.lastname,
-                    "room":  member.uid,
-                    "token": user_token
+            member = Members.get_member_by_username(username)
+            if not member:
+                invalid_data = {
+                    "error_message": "invalid username or password",
+                    "message_key": "invalid_username_or_password",
                }
+                return ResponseHelper.success(data=invalid_data)

-                return ResponseHelper.success(data=response_data)
+            pass_check =  check_password_hash(member.password, password)
+            logger.info("Password check: {}".format(pass_check))
+            if not member or not pass_check:
+                invalid_data = {
+                    "error_message": "invalid username or password",
+                    "message_key": "invalid_username_or_password",
+                }
+                return ResponseHelper.success(data=invalid_data)
+
+            user_data = {}
+            user_data["id"] = member.id,
+            user_data["member_id"]= member.id,
+            user_data["uid"] = str(member.uid),
+
+            user_token = jwt.encode(
+                    {"user": user_data, 'exp' : datetime.datetime.utcnow() + datetime.timedelta(minutes=3330)},
+                    Config.JWT_SECRET_KEY,
+                    algorithm="HS256"
+                )
+
+            # Simulate processing
+            response_data = {
+                "member_id": member.id,
+                "uid":  str(member.uid),
+                "username": member.username,
+                "account_name": member.account_name,
+                "firstname":member.firstname,
+                "lastname": member.lastname,
+                "room":  member.uid,
+                "token": user_token
+            }
+
+            return ResponseHelper.success(data=response_data)

        except ValidationError as err: