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

Cleaned up redundant functions.

Browse Source
This commit is contained in:
Adarnof 2015-12-02 01:18:59 +00:00
parent ae38f8f01f
commit a388e2595e
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
services/managers/discord_manager.py
View File

@ -280,31 +280,6 @@ class DiscordManager:
def __generate_random_pass(): def __generate_random_pass():
return os.urandom(8).encode('hex') return os.urandom(8).encode('hex')
@staticmethod
def old_add_user(username, email):
try:
username_clean = DiscordManager.__sanatize_username(username)
invite_code = DiscordAPIManager.create_invite(settings.DISCORD_SERVER_ID)['code']
password = DiscordManager.__generate_random_pass()
DiscordAPIManager.register_user(server_id=settings.DISCORD_SERVER_ID, username=username_clean, invite_code=invite_code, password=password, email=email)
user_id = DiscordAPIManager.get_user_id(settings.DISCORD_SERVER_ID, username_clean)
DiscordAPIManager.delete_invite(invite_code)
return username_clean, password
except:
return "", ""
@staticmethod
def old_delete_user(username, email, password):
try:
user_id = DiscordAPIManager.get_user_id(settings.DISCORD_SERVER_ID, username)
DiscordAPIManager.kick_user(settings.DISCORD_SERVER_ID, user_id)
DiscordAPIManager.destroy_user(email, password)
return True
except:
#something went wrong
return False
return False
@staticmethod @staticmethod
def update_groups(user_id, groups): def update_groups(user_id, groups):
group_ids = [] group_ids = []
@ -348,14 +323,6 @@ class DiscordManager:
except: except:
return current_password return current_password
@staticmethod
def get_user_id(email, password):
try:
profile = DiscordAPIManager.get_user_profile(email, password)
return profile['user']['id']
except:
return ""
@staticmethod @staticmethod
def add_user(email, password): def add_user(email, password):
try: try:

15
services/views.py
View File

@ -321,19 +321,6 @@ def fleet_fits(request):
return render_to_response('registered/fleetfits.html', context, return render_to_response('registered/fleetfits.html', context,
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@login_required
@user_passes_test(service_blue_alliance_test)
def old_activate_discord(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
character = EveManager.get_character_by_id(authinfo.main_char_id)
info = DiscordManager.add_user(character.character_name, request.user.email)
# If our username is blank means we already had a user
if info[0] is not "":
AuthServicesInfoManager.update_user_discord_info(info[0], info[1], request.user)
update_discord_groups(request.user)
return HttpResponseRedirect("/services/")
return HttpResponseRedirect("/dashboard")
@login_required @login_required
@user_passes_test(service_blue_alliance_test) @user_passes_test(service_blue_alliance_test)
def deactivate_discord(request): def deactivate_discord(request):
@ -341,7 +328,7 @@ def deactivate_discord(request):
result = DiscordManager.delete_user(authinfo.discord_uid) result = DiscordManager.delete_user(authinfo.discord_uid)
remove_all_syncgroups_for_service(request.user, "discord") remove_all_syncgroups_for_service(request.user, "discord")
if result: if result:
AuthServicesInfoManager.update_user_discord_info("",request.user) AuthServicesInfoManager.update_user_discord_info("", request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
return HttpResponseRedirect("/dashboard") return HttpResponseRedirect("/dashboard")