From da74b160f24324f4c76454d306ec4240a89568cf Mon Sep 17 00:00:00 2001 From: topilski Date: Tue, 1 Oct 2019 05:25:31 -0400 Subject: [PATCH] Sources UP --- app/common | 2 +- app/service/subscribers_service_manager.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/common b/app/common index 6dbca79..25132ac 160000 --- a/app/common +++ b/app/common @@ -1 +1 @@ -Subproject commit 6dbca79ea5a4b6537b37792affb5fba2efa8a026 +Subproject commit 25132ac8d45891ac022e5d2661b58b0ea1785b95 diff --git a/app/service/subscribers_service_manager.py b/app/service/subscribers_service_manager.py index e2c559c..fff582f 100644 --- a/app/service/subscribers_service_manager.py +++ b/app/service/subscribers_service_manager.py @@ -159,7 +159,7 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): client.activate_device_fail(cid, 'User invalid password') return False - result = client.activate_device_success(cid, check_user.get_devices()) + result = client.activate_device_success(cid, check_user.get_not_active_devices()) if not result: return False @@ -194,6 +194,10 @@ class SubscribersServiceManager(ServiceManager, IClientHandler): client.login_fail(cid, 'Device not found') return False + if found_device.status == Device.Status.BANNED: + client.login_fail(cid, 'Device banned') + return False + if found_device.status == Device.Status.NOT_ACTIVE: found_device.status = Device.Status.ACTIVE check_user.save()