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

Disabled Discord account reset until a proper mechanism can be thought up.

Browse Source
This commit is contained in:
Adarnof 2015-12-01 06:23:18 +00:00
parent 9e72422639
commit 57b44620cd
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alliance_auth/urls.py
View File

@ -128,7 +128,7 @@ urlpatterns = patterns('',
# Discord Service Control # Discord Service Control
url(r'^activate_discord/$', 'services.views.activate_discord', name='auth_activate_discord'), 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'^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 # Tools
url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view', url(r'^tool/fleet_formatter_tool/$', 'services.views.fleet_formatter_view',

17
services/views.py
View File

@ -337,9 +337,10 @@ def activate_discord(request):
@user_passes_test(service_blue_alliance_test) @user_passes_test(service_blue_alliance_test)
def deactivate_discord(request): def deactivate_discord(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) 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") remove_all_syncgroups_for_service(request.user, "discord")
if result: if result:
AuthServicesInfoManager.update_user_discord_info("", "", request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
return HttpResponseRedirect("/dashboard") return HttpResponseRedirect("/dashboard")
@ -347,8 +348,14 @@ def deactivate_discord(request):
@user_passes_test(service_blue_alliance_test) @user_passes_test(service_blue_alliance_test)
def reset_discord(request): def reset_discord(request):
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = DiscordManager.unlock_user(authinfo.discord_username) result = DiscordManager.delete_user(authinfo.discord_username)
update_discord_groups(request.user)
if result: if result:
return HttpResponseRedirect("/services/") # ensures succesful deletion
return HttpResponseRedirect("/dashboard/") 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/")

8
stock/templates/registered/services.html
View File

@ -127,10 +127,6 @@
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
<a href="{% url 'auth_reset_discord' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_discord' %}"> <a href="{% url 'auth_deactivate_discord' %}">
<button type="button" class="btn btn-danger"><span <button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button> class="glyphicon glyphicon-remove"></span></button>
@ -298,10 +294,6 @@
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% else %}
<a href="{% url 'auth_reset_discord' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_discord' %}"> <a href="{% url 'auth_deactivate_discord' %}">
<button type="button" class="btn btn-danger"><span <button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button> class="glyphicon glyphicon-remove"></span></button>