Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 09:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Included Discord in disable_services from common_task.

Browse Source 
Changed how user accounts in discord are handled: endpoint accepts password and email.
Accounts are created with a password(random) and their user email. Need to activate account through link in email.
This commit is contained in:
Adarnof
2015-12-01 04:12:50 +00:00
parent 90522a5053
commit c009420536
5 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,31 @@
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_DISCORD %}
<tr>
<td class="text-center">Discord</td>
<td class="text-center">{{ authinfo.discord_username }}</td>
<td class="text-center">{{ authinfo.discord_password }}</td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center">
{% ifequal authinfo.discord_username "" %}
<a href="{% url 'auth_activate_discord' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% 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' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_TEAMSPEAK3 %}
<tr>
<th class="text-center">Service</th>
@@ -152,38 +177,6 @@
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_DISCORD %}
<tr>
<th class="text-center">Service</th>
<th class="text-center">Username</th>
<th class="text-center">User ID</th>
<th class="text-center">Domain</th>
<th class="text-center">Action</th>
</tr>
<tr>
<td class="text-center">Discord</td>
<td class="text-center">{{ authinfo.discord_username }}</td>
<td class="text-center">{{ authinfo.discord_uid }}</td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center">
{% ifequal authinfo.discord_username "" %}
<a href="{% url 'auth_activate_discord' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% 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' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
</table>
{% elif perms.auth.member %}
<table class="table table-bordered">
@@ -292,6 +285,31 @@
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_DISCORD %}
<tr>
<td class="text-center">Discord</td>
<td class="text-center">{{ authinfo.discord_username }}</td>
<td class="text-center">{{ authinfo.discord_password }}</td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center">
{% ifequal authinfo.discord_username "" %}
<a href="{% url 'auth_activate_discord' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% 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' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_TEAMSPEAK3 %}
<tr>
<th class="text-center">Service</th>