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

Correct resetting of permission key.

Browse Source 
Thanks @Alf-Life
This commit is contained in:
Adarnof 2018-05-11 10:55:56 -04:00
parent 6d6a3a3d6b
commit 6677e63e08
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/services/modules/teamspeak3/manager.py
View File

@ -245,10 +245,10 @@ class Teamspeak3Manager:
return False return False
def generate_new_permissionkey(self, uid, username): def generate_new_permissionkey(self, uid, user, username):
logger.debug("Re-issuing permission key for user id %s" % uid) logger.debug("Re-issuing permission key for user id %s" % uid)
self.delete_user(uid) self.delete_user(uid)
return self.add_user(username) return self.add_user(user, username)
def update_groups(self, uid, ts_groups): def update_groups(self, uid, ts_groups):
logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups)) logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups))

5
allianceauth/services/modules/teamspeak3/views.py
View File

@ -79,13 +79,12 @@ def reset_teamspeak3_perm(request):
logger.debug("reset_teamspeak3_perm called by user %s" % request.user) logger.debug("reset_teamspeak3_perm called by user %s" % request.user)
if not Teamspeak3Tasks.has_account(request.user): if not Teamspeak3Tasks.has_account(request.user):
return redirect("services:services") return redirect("services:services")
character = request.user.profile.main_character
logger.debug("Deleting TS3 user for user %s" % request.user) logger.debug("Deleting TS3 user for user %s" % request.user)
with Teamspeak3Manager() as ts3man: with Teamspeak3Manager() as ts3man:
ts3man.delete_user(request.user.teamspeak3.uid) ts3man.delete_user(request.user.teamspeak3.uid)
logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character)) logger.debug("Generating new permission key for user %s" % request.user)
result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, character.character_name) result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, request.user, Teamspeak3Tasks.get_username(request.user))
# if blank we failed # if blank we failed
if result[0] != "": if result[0] != "":