Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix users cannot delete mumble account (#567)

Browse Source 
Added helper method for checking a user exists
Added a check for already deleted mumble accounts
This commit is contained in:
Basraah 2016-11-02 13:25:55 +10:00 committed by Adarnof
parent 98e1689aab
commit 2d3055480c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/managers/mumble_manager.py
View File

@ -115,3 +115,7 @@ class MumbleManager:
model.save() model.save()
else: else:
logger.error("User %s not found on mumble. Unable to update groups." % username) logger.error("User %s not found on mumble. Unable to update groups." % username)
@staticmethod
def user_exists(username):
return MumbleUser.objects.filter(username=username).exists()

5
services/views.py
View File

@ -514,9 +514,8 @@ def activate_mumble(request):
def deactivate_mumble(request): def deactivate_mumble(request):
logger.debug("deactivate_mumble called by user %s" % request.user) logger.debug("deactivate_mumble called by user %s" % request.user)
authinfo = AuthServicesInfo.objects.get_or_create(user=request.user)[0] authinfo = AuthServicesInfo.objects.get_or_create(user=request.user)[0]
result = MumbleManager.delete_user(authinfo.mumble_username) # if we successfully remove the user or the user is already removed
# if false we failed if MumbleManager.delete_user(authinfo.mumble_username) or not MumbleManager.user_exists(authinfo.mumble_username):
if result:
AuthServicesInfoManager.update_user_mumble_info("", request.user) AuthServicesInfoManager.update_user_mumble_info("", request.user)
logger.info("Successfully deactivated mumble for user %s" % request.user) logger.info("Successfully deactivated mumble for user %s" % request.user)
messages.success(request, 'Deactivated Mumble account.') messages.success(request, 'Deactivated Mumble account.')