diff --git a/docs/installation/auth/settings.md b/docs/installation/auth/settings.md index e7d3eeb6..6d1afdea 100644 --- a/docs/installation/auth/settings.md +++ b/docs/installation/auth/settings.md @@ -215,52 +215,6 @@ If `True`, add members to groups with their alliance name, prefixed with `Allian If `True`, add blues to groups with their corp name, prefixed with `Corp_` ### BLUE_ALLIANCE_GROUPS If `True`, add blues to groups with their alliance name, prefixed with `Alliance_` -## Alliance Service Setup -### ENABLE_AUTH_FORUM -Allow members of the owning corp or alliance to generate accounts on a Phpbb3 install. -### ENABLE_AUTH_JABBER -Allow members of the owning corp or alliance to generate accounts on an Openfire install. -### ENABLE_AUTH_MUMBLE -Allow members of the owning corp or alliance to generate accounts on a Mumble install. -### ENABLE_AUTH_IPBOARD -Allow members of the owning corp or alliance to generate accounts on an IPBoard install. -### ENABLE_AUTH_TEAMSPEAK3 -Allow members of the owning corp or alliance to generate accounts on a Teamspeak3 install. -### ENABLE_AUTH_DISCORD -Allow members of the owning corp or alliance to link accounts to a Discord server. -### ENABLE_AUTH_DISCOURSE -Allow members of the owning corp or alliance to generate accounts on a Discourse install -### ENABLE_AUTH_IPS4 -Allow members of the owning corp or alliance to generate accounts on a IPSuite4 install. -### ENABLE_AUTH_SMF -Allow members of the owning corp or alliance to generate accounts on a SMF install. -### ENABLE_AUTH_MARKET -Allow members of the owning corp or alliance to generate accounts on an alliance market install. -### ENABLE_AUTH_XENFORO -Allow members of the owning corp or alliance to generate accounts on a XenForo install. -## Blue Service Setup -### ENABLE_BLUE_FORUM -Allow blues of the owning corp or alliance to generate accounts on a Phpbb3 install. -### ENABLE_BLUE_JABBER -Allow blues of the owning corp or alliance to generate accounts on an Openfire install. -### ENABLE_BLUE_MUMBLE -Allow blues of the owning corp or alliance to generate accounts on a Mumble install. -### ENABLE_BLUE_IPBOARD -Allow blues of the owning corp or alliance to generate accounts on an IPBoard install. -### ENABLE_BLUE_TEAMSPEAK3 -Allow blues of the owning corp or alliance to generate accounts on a Teamspeak3 install. -### ENABLE_BLUE_DISCORD -Allow blues of the owning corp or alliance to link accounts to a Discord server. -### ENABLE_BLUE_DISCOURSE -Allow blues of the owning corp or alliance to generate accounts on a Discourse install. -### ENABLE_BLUE_IPS4 -Allow blues of the owning corp or alliance to generate accounts on an IPSuite4 install. -### ENABLE_BLUE_SMF -Allow blues of the owning corp or alliance to generate accounts on a SMF install. -### ENABLE_BLUE_MARKET -Allow blues of the owning corp or alliance to generate accounts on an alliance market install. -### ENABLE_BLUE_XENFORO -Allow blues of the owning corp or alliance to generate accounts on a XenForo install. ## Tenant Configuration Characters of any corp or alliance with their ID here will be treated as a member. ### CORP_IDS diff --git a/services/modules/discord/tasks.py b/services/modules/discord/tasks.py index 50a4a1ba..3acae4a1 100644 --- a/services/modules/discord/tasks.py +++ b/services/modules/discord/tasks.py @@ -121,7 +121,7 @@ class DiscordTasks: def update_all_nicknames(): logger.debug("Updating ALL discord nicknames") for discord_user in DiscordUser.objects.exclude(uid__exact=''): - DiscordTasks.update_nickname.delay(discord_user.user.user_id) + DiscordTasks.update_nickname.delay(discord_user.user.pk) @classmethod def disable(cls): diff --git a/services/modules/discord/templates/registered/discord_service_ctrl.html b/services/modules/discord/templates/registered/discord_service_ctrl.html index 7b7fa34b..a2449910 100644 --- a/services/modules/discord/templates/registered/discord_service_ctrl.html +++ b/services/modules/discord/templates/registered/discord_service_ctrl.html @@ -7,14 +7,14 @@ https://discordapp.com {% if not discord_uid %} - + {% else %} - + - + {% endif %} diff --git a/services/modules/discourse/templates/registered/discourse_service_ctrl.html b/services/modules/discourse/templates/registered/discourse_service_ctrl.html index 7cae0cd2..e3c6d289 100644 --- a/services/modules/discourse/templates/registered/discourse_service_ctrl.html +++ b/services/modules/discourse/templates/registered/discourse_service_ctrl.html @@ -4,5 +4,5 @@ {{ char.character_name }} {{ DISCOURSE_URL }} - + diff --git a/services/modules/mumble/auth_hooks.py b/services/modules/mumble/auth_hooks.py index 4585744f..d2fcf307 100644 --- a/services/modules/mumble/auth_hooks.py +++ b/services/modules/mumble/auth_hooks.py @@ -21,6 +21,7 @@ class MumbleService(ServicesHook): self.urlpatterns = urlpatterns self.service_url = settings.MUMBLE_URL self.access_perm = 'mumble.access_mumble' + self.service_ctrl_template = 'registered/mumble_service_ctrl.html' def delete_user(self, user, notify_user=False): logging.debug("Deleting user %s %s account" % (user, self.name)) @@ -57,6 +58,7 @@ class MumbleService(ServicesHook): 'service_name': self.title, 'urls': urls, 'service_url': self.service_url, + 'connect_url': request.user.mumble.username + '@' + self.service_url if MumbleTasks.has_account(request.user) else self.service_url, 'username': request.user.mumble.username if MumbleTasks.has_account(request.user) else '', }, request=request) diff --git a/services/modules/mumble/templates/registered/mumble_service_ctrl.html b/services/modules/mumble/templates/registered/mumble_service_ctrl.html new file mode 100644 index 00000000..e818b7db --- /dev/null +++ b/services/modules/mumble/templates/registered/mumble_service_ctrl.html @@ -0,0 +1,25 @@ + + {{ service_name }} + {{ username }} + {{ service_url }} + + {% ifequal username "" %} + + + + {% else %} + + + + + + + + + + + + + {% endifequal %} + + diff --git a/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html b/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html index 7ac4840b..775d6bf7 100644 --- a/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html +++ b/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html @@ -1,34 +1,27 @@ {% load i18n %} - - {% trans "Service" %} - {% trans "Unique ID" %} - PermissionKey - {% trans "Action" %} - Teamspeak 3 {{ authinfo.teamspeak3_uid }} - {{ authinfo.teamspeak3_perm_key }} + {{ TEAMSPEAK3_PUBLIC_URL }} {% ifequal authinfo.teamspeak3_uid "" %} - + {% else %} - - - - + - + - + + + + {% endifequal %} - \ No newline at end of file + diff --git a/services/signals.py b/services/signals.py index 937e72aa..600d9ca0 100644 --- a/services/signals.py +++ b/services/signals.py @@ -52,7 +52,7 @@ def m2m_changed_user_permissions(sender, instance, action, *args, **kwargs): svc.validate_user(instance) except: logger.exception( - 'Exception running validate_user for services module {} on user {}'.format(svc, user)) + 'Exception running validate_user for services module {} on user {}'.format(svc, instance)) transaction.on_commit(lambda: validate_all_services()) diff --git a/stock/templates/registered/services.html b/stock/templates/registered/services.html index 744c3db0..7ee5ba36 100755 --- a/stock/templates/registered/services.html +++ b/stock/templates/registered/services.html @@ -10,7 +10,7 @@ {% block content %}

{% trans "Available Services" %}

- +
diff --git a/stock/templates/registered/services_ctrl.html b/stock/templates/registered/services_ctrl.html index 272cf101..f34f9a8e 100644 --- a/stock/templates/registered/services_ctrl.html +++ b/stock/templates/registered/services_ctrl.html @@ -7,23 +7,23 @@
{% trans "Service" %} {% trans "Username" %} {% ifequal username "" %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_set_password %} - + {% endif %} {% if urls.auth_reset_password %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %}