diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index 78f3fbd4..9fb00a5d 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -128,7 +128,7 @@ urlpatterns = patterns('', # Discord Service Control url(r'^activate_discord/$', 'services.views.activate_discord', name='auth_activate_discord'), url(r'^deactivate_discord/$', 'services.views.deactivate_discord', name='auth_deactivate_discord'), - url(r'^reset_discord/$', 'services.views.reset_discord', name='auth_reset_discord'), +# url(r'^reset_discord/$', 'services.views.reset_discord', name='auth_reset_discord'), # Tools url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view', diff --git a/services/views.py b/services/views.py index 114f5f1a..100f05b5 100755 --- a/services/views.py +++ b/services/views.py @@ -337,9 +337,10 @@ def activate_discord(request): @user_passes_test(service_blue_alliance_test) def deactivate_discord(request): authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) - result = DiscordManager.lock_user(authinfo.discord_username) + result = DiscordManager.delete_user(authinfo.discord_username) remove_all_syncgroups_for_service(request.user, "discord") if result: + AuthServicesInfoManager.update_user_discord_info("", "", request.user) return HttpResponseRedirect("/services/") return HttpResponseRedirect("/dashboard") @@ -347,8 +348,14 @@ def deactivate_discord(request): @user_passes_test(service_blue_alliance_test) def reset_discord(request): authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) - result = DiscordManager.unlock_user(authinfo.discord_username) - update_discord_groups(request.user) + result = DiscordManager.delete_user(authinfo.discord_username) if result: - return HttpResponseRedirect("/services/") - return HttpResponseRedirect("/dashboard/") + # ensures succesful deletion + AuthServicesInfoManager.update_user_discord_info("", "", request.user) + new_result = DiscordManager.add_user(authinfo.discord_username, request.user.email) + if new_result: + # ensures succesful creation + AuthServicesInfoManager.update_user_discord_info(new_result[0], new_result[1], request.user) + update_discord_groups(request.user) + return HttpResponseRedirect("/services/") + return HttpResponseRedirect("/services/") diff --git a/stock/templates/registered/services.html b/stock/templates/registered/services.html index 0f65ed09..3977eb42 100755 --- a/stock/templates/registered/services.html +++ b/stock/templates/registered/services.html @@ -127,10 +127,6 @@ class="glyphicon glyphicon-ok"> {% else %} - - - @@ -298,10 +294,6 @@ class="glyphicon glyphicon-ok"> {% else %} - - -