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

Reworked permission correction during API check. Is cleaner... a bit.

Browse Source
This commit is contained in:
Adarnof 2015-09-19 05:28:49 +00:00
parent c0d8e880ab
commit a62988530d
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
celerytask/tasks.py
View File

@ -16,7 +16,10 @@ from util.common_task import deactivate_services
from util import add_member_permission from util import add_member_permission
from util import remove_member_permission from util import remove_member_permission
from util import check_if_user_has_permission from util import check_if_user_has_permission
from eveonline.views import disable_alliance_member
from eveonline.views import disable_blue_member
from util.common_task import add_user_to_group
from util.common_task import remove_user_from_group
def update_jabber_groups(user): def update_jabber_groups(user):
syncgroups = SyncGroupCache.objects.filter(user=user) syncgroups = SyncGroupCache.objects.filter(user=user)
@ -212,16 +215,19 @@ def run_api_refresh():
pass pass
elif corp is not None: elif corp is not None:
if corp.is_blue is not True: if corp.is_blue is not True:
deactivate_services(user)
if check_if_user_has_permission(user, "member"): if check_if_user_has_permission(user, "member"):
remove_member_permission(user, "member") disable_alliance_member(user, authserviceinfo.main_char_id)
if check_if_user_has_permission(user, "blue_member"): elif check_if_user_has_permission(user, "blue_member"):
remove_member_permission(user, "blue_member") disable_blue_member(user, authserviceonfo.main_char_id)
else:
deactivate_services(user)
else: else:
if check_if_user_has_permission(user, "member"): if check_if_user_has_permission(user, "member"):
remove_member_permission(user, "member") remove_member_permission(user, "member")
remove_user_from_group(user, settings.DEFAULT_AUTH_GROUP)
if not check_if_user_has_permission(user, "blue_member"): if not check_if_user_has_permission(user, "blue_member"):
add_member_permission(user, "blue_member") add_member_permission(user, "blue_member")
add_user_to_group(user, settings.DEFAULT_BLUE_GROUP)
#Fix mumble username ticker #Fix mumble username ticker
result = MumbleManager.delete_user(authserviceinfo.mumble_username) result = MumbleManager.delete_user(authserviceinfo.mumble_username)
@ -231,18 +237,21 @@ def run_api_refresh():
#make new user (how generous) #make new user (how generous)
else: else:
deactivate_services(user)
if check_if_user_has_permission(user, "member"): if check_if_user_has_permission(user, "member"):
remove_member_permission(user, "member") disable_alliance_member(user, authserviceinfo.main_char_id)
if check_if_user_has_permission(user, "blue_member"): elif check_if_user_has_permission(user, "blue_member"):
remove_member_permission(user, "blue_member") disable_blue_member(user, authserviceonfo.main_char_id)
else:
deactivate_services(user)
else: else:
# nuke it # nuke it
deactivate_services(user)
if check_if_user_has_permission(user, "member"): if check_if_user_has_permission(user, "member"):
remove_member_permission(user, "member") disable_alliance_member(user, authserviceinfo.main_char_id)
if check_if_user_has_permission(user, "blue_member"): elif check_if_user_has_permission(user, "blue_member"):
remove_member_permission(user, "blue_member") disable_blue_member(user, authserviceonfo.main_char_id)
else:
deactivate_services(user)
else: else:
print 'No main_char_id set' print 'No main_char_id set'