From 3e2d1b15db697943dc1656c6ba3bba73ddab50fb Mon Sep 17 00:00:00 2001 From: topilski Date: Sat, 28 Sep 2019 15:08:39 -0400 Subject: [PATCH] Sources Sync --- app/common | 2 +- app/service/subscribers_service_manager.py | 72 +++++++++++----------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/common b/app/common index 9c8bead..694cf21 160000 --- a/app/common +++ b/app/common @@ -1 +1 @@ -Subproject commit 9c8bead8fa7a115a16192c7ef6a0f371af622d65 +Subproject commit 694cf21806c396a97732aeb49a8f4b2784a1bb8c diff --git a/app/service/subscribers_service_manager.py b/app/service/subscribers_service_manager.py index 283e8f2..7e04b95 100644 --- a/app/service/subscribers_service_manager.py +++ b/app/service/subscribers_service_manager.py @@ -142,6 +142,35 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): login = params[Subscriber.EMAIL_FIELD] password_hash = params[Subscriber.PASSWORD_FIELD] + check_user = Subscriber.objects(email=login, class_check=False).first() + if not check_user: + client.activate_device_fail(cid, 'User not found') + return False + + if check_user.status == Subscriber.Status.NOT_ACTIVE: + client.activate_device_fail(cid, 'User not active') + return False + + if check_user.status == Subscriber.Status.BANNED: + client.activate_device_fail(cid, 'Banned user') + return False + + if check_user[Subscriber.PASSWORD_FIELD] != password_hash: + client.activate_device_fail(cid, 'User invalid password') + return False + + result = client.activate_device_success(cid, check_user.get_devices()) + if not result: + return False + client.info = check_user + self.__activate_subscriber(client) + return True + + def _handle_login(self, client, cid: str, params: dict) -> bool: + login = params[Subscriber.EMAIL_FIELD] + password_hash = params[Subscriber.PASSWORD_FIELD] + device_id = params['device_id'] + check_user = Subscriber.objects(email=login, class_check=False).first() if not check_user: client.login_fail(cid, 'User not found') @@ -159,47 +188,18 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): client.login_fail(cid, 'User invalid password') return False - result = client.login_success(cid, ) - if not result: - return False - client.info = check_user - self.__activate_subscriber(client) - return True - - def _handle_login(self, client, cid: str, params: dict) -> bool: - login = params[Subscriber.EMAIL_FIELD] - password_hash = params[Subscriber.PASSWORD_FIELD] - device_id = params['device_id'] - - check_user = Subscriber.objects(email=login, class_check=False).first() - if not check_user: - client.activate_fail(cid, 'User not found') - return False - - if check_user.status == Subscriber.Status.NOT_ACTIVE: - client.activate_fail(cid, 'User not active') - return False - - if check_user.status == Subscriber.Status.BANNED: - client.activate_fail(cid, 'Banned user') - return False - - if check_user[Subscriber.PASSWORD_FIELD] != password_hash: - client.activate_fail(cid, 'User invalid password') - return False - found_device = check_user.find_device(device_id) if not found_device: - client.activate_fail(cid, 'Device not found') + client.login_fail(cid, 'Device not found') return False user_connections = self.get_user_connections_by_email(login) for conn in user_connections: if conn.device == found_device: - client.activate_fail(cid, 'Device in use') + client.login_fail(cid, 'Device in use') return False - result = client.activate_success(cid) + result = client.login_success(cid) if not result: return False client.info = check_user @@ -209,7 +209,7 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): def _handle_get_server_info(self, client, cid: str, params: dict) -> bool: if not check_is_auth_client(client): - client.check_activate_fail(cid, 'User not active') + client.check_login_fail(cid, 'User not active') return False return client.get_server_info_success(cid, @@ -217,14 +217,14 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): def _handle_client_ping(self, client, cid: str, params: dict) -> bool: if not check_is_auth_client(client): - client.check_activate_fail(cid, 'User not active') + client.check_login_fail(cid, 'User not active') return False return client.pong(cid) def _handle_get_channels(self, client, cid: str, params: dict) -> bool: if not check_is_auth_client(client): - client.check_activate_fail(cid, 'User not active') + client.check_login_fail(cid, 'User not active') return False channels = client.info.get_streams() @@ -232,7 +232,7 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): def _handle_get_runtime_channel_info(self, client, cid: str, params: dict) -> bool: if not check_is_auth_client(client): - client.check_activate_fail(cid, 'User not active') + client.check_login_fail(cid, 'User not active') return False sid = params['id']