From 6677e63e08c04fb6c4b708c789e9ee3adc6cc360 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Fri, 11 May 2018 10:55:56 -0400 Subject: [PATCH] Correct resetting of permission key. Thanks @Alf-Life --- allianceauth/services/modules/teamspeak3/manager.py | 4 ++-- allianceauth/services/modules/teamspeak3/views.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/allianceauth/services/modules/teamspeak3/manager.py b/allianceauth/services/modules/teamspeak3/manager.py index 2d2ea8e4..a5c977d3 100755 --- a/allianceauth/services/modules/teamspeak3/manager.py +++ b/allianceauth/services/modules/teamspeak3/manager.py @@ -245,10 +245,10 @@ class Teamspeak3Manager: 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) self.delete_user(uid) - return self.add_user(username) + return self.add_user(user, username) def update_groups(self, uid, ts_groups): logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups)) diff --git a/allianceauth/services/modules/teamspeak3/views.py b/allianceauth/services/modules/teamspeak3/views.py index 5e5a8e2a..1526b28d 100644 --- a/allianceauth/services/modules/teamspeak3/views.py +++ b/allianceauth/services/modules/teamspeak3/views.py @@ -79,13 +79,12 @@ def reset_teamspeak3_perm(request): logger.debug("reset_teamspeak3_perm called by user %s" % request.user) if not Teamspeak3Tasks.has_account(request.user): return redirect("services:services") - character = request.user.profile.main_character logger.debug("Deleting TS3 user for user %s" % request.user) with Teamspeak3Manager() as ts3man: ts3man.delete_user(request.user.teamspeak3.uid) - logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character)) - result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, character.character_name) + logger.debug("Generating new permission key for user %s" % request.user) + result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, request.user, Teamspeak3Tasks.get_username(request.user)) # if blank we failed if result[0] != "":