remove cred from keyring (msui)

Author: divaajainn

mslib/mscolab/file_manager.py

@@ -39,8 +39,6 @@
 from mslib.utils.verify_waypoint_data import verify_waypoint_data
 from mslib.mscolab.models import db, Operation, Permission, User, Change, Message
 from mslib.mscolab.conf import mscolab_settings
-from mslib.utils.auth import del_password_from_keyring
-from mslib.utils.config import config_loader
 
 
 class FileManager:
@@ -235,8 +233,6 @@ def modify_user(self, user, attribute=None, value=None, action=None):
                 # Delete profile image if it exists
                 if user.profile_image_path:
                     self.delete_user_profile_image(user.profile_image_path)
-                mscolab_server_url = config_loader(dataset="default_MSCOLAB")
-                del_password_from_keyring(service_name=mscolab_server_url[0], username=user.emailid)
                 db.session.delete(user)
                 db.session.commit()
             user_query = User.query.filter_by(id=user.id).first()

mslib/msui/mscolab.py

@@ -61,7 +61,7 @@
 from PyQt5.QtWidgets import QDialog, QFileDialog, QMessageBox
 from PyQt5.QtGui import QPixmap
 
-from mslib.utils.auth import get_password_from_keyring, save_password_to_keyring
+from mslib.utils.auth import get_password_from_keyring, save_password_to_keyring, del_password_from_keyring
 from mslib.utils.verify_user_token import verify_user_token as _verify_user_token
 from mslib.utils.verify_waypoint_data import verify_waypoint_data
 from mslib.utils.qt import get_open_filename, get_save_filename, dropEvent, dragEnterEvent, show_popup
@@ -937,6 +937,7 @@ def delete_account(self, _=None):
         if reply == QMessageBox.No:
             return
         try:
+            del_password_from_keyring(self.mscolab_server_url, self.email)
             response = self.conn.request_post("delete_own_account")
         except requests.exceptions.RequestException as ex:
             raise MSColabConnectionError(f"Some error occurred ({ex})! Please reconnect.")