diff --git a/services/managers/discord_manager.py b/services/managers/discord_manager.py index 3613833a..80c90609 100644 --- a/services/managers/discord_manager.py +++ b/services/managers/discord_manager.py @@ -280,31 +280,6 @@ class DiscordManager: def __generate_random_pass(): 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 def update_groups(user_id, groups): group_ids = [] @@ -348,14 +323,6 @@ class DiscordManager: except: 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 def add_user(email, password): try: diff --git a/services/views.py b/services/views.py index 232c7a4b..eb856665 100755 --- a/services/views.py +++ b/services/views.py @@ -321,19 +321,6 @@ def fleet_fits(request): return render_to_response('registered/fleetfits.html', context, 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 @user_passes_test(service_blue_alliance_test) def deactivate_discord(request): @@ -341,7 +328,7 @@ def deactivate_discord(request): result = DiscordManager.delete_user(authinfo.discord_uid) remove_all_syncgroups_for_service(request.user, "discord") if result: - AuthServicesInfoManager.update_user_discord_info("",request.user) + AuthServicesInfoManager.update_user_discord_info("", request.user) return HttpResponseRedirect("/services/") return HttpResponseRedirect("/dashboard")