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

Added fix for syncgroup not working

Browse Source
This commit is contained in:
Raynaldo Rivera 2014-11-29 19:14:00 -07:00
parent 1e8afb77c6
commit 08f923624f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
celerytask/tasks.py
View File

@ -91,6 +91,13 @@ def create_syncgroup_for_user(user, groupname, servicename):
synccache.save()
def remove_all_syncgroups_for_service(user, servicename):
syncgroups = SyncGroupCache.objects.filter(user=user)
for syncgroup in syncgroups:
if syncgroup.servicename == servicename:
syncgroup.delete()
def add_to_databases(user, groups, syncgroups):
authserviceinfo = None
try:
@ -101,7 +108,6 @@ def add_to_databases(user, groups, syncgroups):
if authserviceinfo:
authserviceinfo = AuthServicesInfo.objects.get(user=user)
update = False
for group in groups:
if authserviceinfo.jabber_username and authserviceinfo.jabber_username != "":

12
services/views.py
View File

@ -12,6 +12,7 @@ from managers.ipboard_manager import IPBoardManager
from managers.teamspeak3_manager import Teamspeak3Manager
from authentication.managers import AuthServicesInfoManager
from eveonline.managers import EveManager
from celerytask.tasks import remove_all_syncgroups_for_service
from celerytask.tasks import update_jabber_groups
from celerytask.tasks import update_mumble_groups
from celerytask.tasks import update_forum_groups
@ -96,6 +97,7 @@ def activate_forum(request):
def deactivate_forum(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Phpbb3Manager.disable_user(authinfo.forum_username)
remove_all_syncgroups_for_service(request.user, "phpbb")
# false we failed
if result:
AuthServicesInfoManager.update_user_forum_info("", "", request.user)
@ -134,6 +136,7 @@ def activate_ipboard_forum(request):
def deactivate_ipboard_forum(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = IPBoardManager.disable_user(authinfo.ipboard_username)
remove_all_syncgroups_for_service(request.user, "ipboard")
# false we failed
if result:
AuthServicesInfoManager.update_user_ipboard_info("", "", request.user)
@ -171,6 +174,7 @@ def activate_jabber(request):
def deactivate_jabber(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = OpenfireManager.delete_user(authinfo.jabber_username)
remove_all_syncgroups_for_service(request.user, "openfire")
# If our username is blank means we failed
if result:
AuthServicesInfoManager.update_user_jabber_info("", "", request.user)
@ -212,6 +216,7 @@ def activate_mumble(request):
def deactivate_mumble(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = MumbleManager.delete_user(authinfo.mumble_username)
remove_all_syncgroups_for_service(request.user, "mumble")
# if false we failed
if result:
AuthServicesInfoManager.update_user_mumble_info("", "", request.user)
@ -224,6 +229,7 @@ def deactivate_mumble(request):
def reset_mumble_password(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = MumbleManager.update_user_password(authinfo.mumble_username)
# if blank we failed
if result != "":
AuthServicesInfoManager.update_user_mumble_info(authinfo.mumble_username, result, request.user)
@ -254,9 +260,13 @@ def activate_teamspeak3(request):
def deactivate_teamspeak3(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid)
remove_all_syncgroups_for_service(request.user, "teamspeak3")
# if false we failed
if result:
AuthServicesInfoManager.update_user_teamspeak3_info("", "", request.user)
return HttpResponseRedirect("/services/")
return HttpResponseRedirect("/")
@ -269,6 +279,8 @@ def reset_teamspeak3_perm(request):
Teamspeak3Manager.delete_user(authinfo.teamspeak3_uid)
remove_all_syncgroups_for_service(request.user, "teamspeak3")
if check_if_user_has_permission(request.user, "blue_member"):
result = Teamspeak3Manager.generate_new_blue_permissionkey(authinfo.teamspeak3_uid, character.character_name,
character.corporation_ticker)