From 866e530f51f4b7528ba30e02f7250518382d0dda Mon Sep 17 00:00:00 2001 From: edip Date: Thu, 22 Nov 2018 14:54:39 +0300 Subject: [PATCH] registrtion db change user table for session --- src/base/database/ahenk_db_service.py | 2 +- src/base/execution/execution_manager.py | 13 +++++++------ src/base/registration/registration.py | 6 ------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/base/database/ahenk_db_service.py b/src/base/database/ahenk_db_service.py index a238c21..c3a78fc 100644 --- a/src/base/database/ahenk_db_service.py +++ b/src/base/database/ahenk_db_service.py @@ -50,7 +50,7 @@ class AhenkDbService(object): self.check_and_create_table('agreement', ['id INTEGER PRIMARY KEY AUTOINCREMENT', 'contract_id TEXT', 'username TEXT', 'timestamp TEXT', 'choice TEXT']) - self.check_and_create_table('session', ['username TEXT', 'display TEXT', 'desktop TEXT', 'timestamp TEXT', 'ip TEXT']) + self.check_and_create_table('session', ['id INTEGER PRIMARY KEY AUTOINCREMENT','username TEXT', 'display TEXT', 'desktop TEXT', 'timestamp TEXT', 'ip TEXT']) self.check_and_create_table('mail', ['id INTEGER PRIMARY KEY AUTOINCREMENT', 'command TEXT', 'mailstatus INTEGER', 'timestamp TEXT']) diff --git a/src/base/execution/execution_manager.py b/src/base/execution/execution_manager.py index cfbb00d..8a17089 100644 --- a/src/base/execution/execution_manager.py +++ b/src/base/execution/execution_manager.py @@ -403,17 +403,18 @@ class ExecutionManager(object): j = json.loads(msg) status = str(j['status']).lower() + user_name = self.db_service.select_one_result('session', 'username', " 1=1 order by id desc ") + display = self.db_service.select_one_result('session', 'display', " 1=1 order by id desc ") + if 'not_authorized' == str(status): self.logger.info('Registration is failed. User not authorized') - - user_name = self.db_service.select_one_result('session', 'username') - display = self.db_service.select_one_result('session', 'display') - Util.show_message(user_name,display,'Ahenk Lider MYS sisteminden çıkarmak için yetkili kullanıcı haklarına sahip olmanız gerekmektedir.', 'Kullanıcı Yetkilendirme Hatası') else : - registration= Scope.get_instance().get_registration() - registration.purge_and_unregister() + Util.show_message(user_name, display, "Ahenk Lider MYS sisteminden çıkarılmıştır.", "") + if Util.show_message(user_name, display, "Değişikliklerin etkili olması için sistemi yeniden başlatmanız gerekmektedir.", "") : + registration= Scope.get_instance().get_registration() + registration.purge_and_unregister() def json_to_task_bean(self, json_data, file_server_conf=None): diff --git a/src/base/registration/registration.py b/src/base/registration/registration.py index 3648e47..b3e8709 100644 --- a/src/base/registration/registration.py +++ b/src/base/registration/registration.py @@ -358,13 +358,7 @@ class Registration: def purge_and_unregister(self): try: - user_name = self.db_service.select_one_result('session', 'username') - display = self.db_service.select_one_result('session', 'display') - Util.show_message(user_name, display, "Ahenk Lider MYS sisteminden çıkarılmıştır.", "") - - Util.show_message(user_name, display, - "Değişikliklerin etkili olması için sistem yeniden başlatmanız gerekmektedir.", "") self.logger.info('Ahenk conf cleaned') self.logger.info('Ahenk conf cleaning from db')