The Great Services Refactor (#594)

* Hooks registration, discovery and retrieval module

Will discover @hooks.register decorated functions inside
the auth_hooks module in any installed django app.

* Class to register modular service apps

* Register service modules URLs

* Example service module

* Refactor services into modules

Each service type has been split out into its own django app/module. A
hook mechanism is provided to register a subclass of the ServiceHook
class. The modules then overload functions defined in ServiceHook as
required to provide interoperability with alliance auth. Service modules
provide their own urls and views for user registration and account
management and a partial template to display on the services page. Where
possible, new modules should provide their own models for local data
storage.

* Added menu items hooks and template tags

* Added menu item hook for broadcasts

* Added str method to ServicesHook

* Added exception handling to hook iterators

* Refactor mumble migration and table name

Upgrading will require `migrate mumble --fake-initial` to be run first
and then `migrate mumble` to rename the table.

* Refactor teamspeak3 migration and rename table

Upgrading will require `migrate teamspeak3 --fake-initial`

* Added module models and migrations for refactoring AuthServicesInfo

* Migrate AuthServiceInfo fields to service modules models

* Added helper for getting a users main character

* Added new style celery instance

* Changed Discord from AuthServicesInfo to DiscordUser model

* Switch celery tasks to staticmethods

* Changed Discourse from AuthServicesInfo to DiscourseUser model

* Changed IPBoard from AuthServicesInfo to IpboardUser model

* Changed Ips4 from AuthServicesInfo to Ips4User model

Also added disable service task.

This service still needs some love though. Was always missing a
deactivate services hook (before refactoring) for reasons I'm unsure of
so I'm reluctant to add it without knowing why.

* Changed Market from AuthServicesInfo to MarketUser model

* Changed Mumble from AuthServicesInfo to MumbleUser model

Switched user foreign key to one to one relationship.
Removed implicit password change on user exists.
Combined regular and blue user creation.

* Changed Openfire from AuthServicesInfo to OpenfireUser model

* Changed SMF from AuthServicesInfo to SmfUser model

Added disable task

* Changed Phpbb3 from AuthServicesInfo to Phpbb3User model

* Changed XenForo from AuthServicesInfo to XenforoUser model

* Changed Teamspeak3 from AuthServicesInfo to Teamspeak3User model

* Remove obsolete manager functions

* Standardise URL format

This will break some callback URLs
Discord changes from /discord_callback/ to /discord/callback/

* Removed unnecessary imports

* Mirror upstream decorator change

* Setup for unit testing

* Unit tests for discord service

* Added add main character helper

* Added Discourse unit tests

* Added Ipboard unit tests

* Added Ips4 unit tests

* Fix naming of market manager, switch to use class methods

* Remove unused hook functions

* Added market service unit tests

* Added corp ticker to add main character helper

* Added mumble unit tests

* Fix url name and remove namespace

* Fix missing return and add missing URL

* Added openfire unit tests

* Added missing return

* Added phpbb3 unit tests

* Fix SmfManager naming inconsistency and switch to classmethods

* Added smf unit tests

* Remove unused functions, Added missing return

* Added xenforo unit tests

* Added missing return

* Fixed reference to old model

* Fixed error preventing groups from syncing on reset request

* Added teamspeak3 unit tests

* Added nose as test runner and some test settings

* Added package requirements for running tests

* Added unit tests for services signals and tasks

* Remove unused tests file

* Fix teamspeak3 service signals

* Added unit tests for teamspeak3 signals

Changed other unit tests setUp to inert signals

* Fix password gen and hashing python3 compatibility

Fixes #630

Adds unit tests to check the password functions run on both platforms.

* Fix unit test to not rely on checking url params

* Add Travis CI settings file

* Remove default blank values from services models

* Added dynamic user model admin actions for syncing service groups

* Remove unused search fields

* Add hook function for syncing nicknames

* Added discord hook for sync nickname

* Added user admin model menu actions for sync nickname hook

* Remove obsolete code

* Rename celery config app to avoid package name clash

* Added new style celerybeat schedule configuration

periodic_task decorator is depreciated

* Added string representations

* Added admin pages for services user models

* Removed legacy code

* Move link discord button to correct template

* Remove blank default fields from example model

* Disallow empty django setting

* Fix typos

* Added coverage configuration file

* Add coverage and coveralls to travis config

Should probably use nose's built in coverage, but this works for now.

* Replace AuthServicesInfo get_or_create instances with get

Reflects upstream changes to AuthServicesInfo behaviour.

* Update mumble user table name

* Split out mumble authenticator requirements

zeroc-ice seems to cause long build times on travis-ci and isn't
required for the core projects functionality or testing.

services/modules/discord/admin.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+from django.contrib import admin
+from .models import DiscordUser
+
+
+class DiscordUserAdmin(admin.ModelAdmin):
+        list_display = ('user', 'uid')
+        search_fields = ('user__username', 'uid')
+
+admin.site.register(DiscordUser, DiscordUserAdmin)

services/modules/discord/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class DiscordServiceConfig(AppConfig):
+    name = 'discord'

services/modules/discord/auth_hooks.py

@@ -0,0 +1,59 @@
+from __future__ import unicode_literals
+
+import logging
+
+from django.conf import settings
+from django.template.loader import render_to_string
+
+from alliance_auth import hooks
+from services.hooks import ServicesHook
+from .tasks import DiscordTasks
+from .urls import urlpatterns
+
+logger = logging.getLogger(__name__)
+
+
+class DiscordService(ServicesHook):
+    def __init__(self):
+        ServicesHook.__init__(self)
+        self.urlpatterns = urlpatterns
+        self.name = 'discord'
+        self.service_ctrl_template = 'registered/discord_service_ctrl.html'
+
+    def delete_user(self, user, notify_user=False):
+        logger.debug('Deleting user %s %s account' % (user, self.name))
+        return DiscordTasks.delete_user(user, notify_user=notify_user)
+
+    def update_groups(self, user):
+        logger.debug('Processing %s groups for %s' % (self.name, user))
+        if DiscordTasks.has_account(user):
+            DiscordTasks.update_groups.delay(user.pk)
+
+    def validate_user(self, user):
+        logger.debug('Validating user %s %s account' % (user, self.name))
+        if DiscordTasks.has_account(user) and not self.service_active_for_user(user):
+            self.delete_user(user, notify_user=True)
+
+    def sync_nickname(self, user):
+        logger.debug('Syncing %s nickname for user %s' % (self.name, user))
+        DiscordTasks.update_nickname.delay(user.pk)
+
+    def update_all_groups(self):
+        logger.debug('Update all %s groups called' % self.name)
+        DiscordTasks.update_all_groups.delay()
+
+    def service_enabled_members(self):
+        return settings.ENABLE_AUTH_DISCORD or False
+
+    def service_enabled_blues(self):
+        return settings.ENABLE_BLUE_DISCORD or False
+
+    def render_services_ctrl(self, request):
+        return render_to_string(self.service_ctrl_template, {
+            'discord_uid': request.user.discord.uid if DiscordTasks.has_account(request.user) else None,
+        }, request=request)
+
+
+@hooks.register('services_hook')
+def register_service():
+    return DiscordService()

services/modules/discord/manager.py

@@ -0,0 +1,201 @@
+from __future__ import unicode_literals
+import requests
+import json
+import re
+from django.conf import settings
+from services.models import GroupCache
+from requests_oauthlib import OAuth2Session
+import logging
+import datetime
+from django.utils import timezone
+
+logger = logging.getLogger(__name__)
+
+DISCORD_URL = "https://discordapp.com/api"
+EVE_IMAGE_SERVER = "https://image.eveonline.com"
+
+AUTH_URL = "https://discordapp.com/api/oauth2/authorize"
+TOKEN_URL = "https://discordapp.com/api/oauth2/token"
+
+# needs administrator, since Discord can't get their permissions system to work
+# was kick members, manage roles, manage nicknames
+#BOT_PERMISSIONS = 0x00000002 + 0x10000000 + 0x08000000
+BOT_PERMISSIONS = 0x00000008
+
+# get user ID, accept invite
+SCOPES = [
+    'identify',
+    'guilds.join',
+]
+
+GROUP_CACHE_MAX_AGE = datetime.timedelta(minutes=30)
+
+
+class DiscordOAuthManager:
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def _sanitize_groupname(name):
+        name = name.strip(' _')
+        return re.sub('[^\w.-]', '', name)
+
+    @staticmethod
+    def generate_bot_add_url():
+        return AUTH_URL + '?client_id=' + settings.DISCORD_APP_ID + '&scope=bot&permissions=' + str(BOT_PERMISSIONS)
+
+    @staticmethod
+    def generate_oauth_redirect_url():
+        oauth = OAuth2Session(settings.DISCORD_APP_ID, redirect_uri=settings.DISCORD_CALLBACK_URL, scope=SCOPES)
+        url, state = oauth.authorization_url(AUTH_URL)
+        return url
+
+    @staticmethod
+    def _process_callback_code(code):
+        oauth = OAuth2Session(settings.DISCORD_APP_ID, redirect_uri=settings.DISCORD_CALLBACK_URL)
+        token = oauth.fetch_token(TOKEN_URL, client_secret=settings.DISCORD_APP_SECRET, code=code)
+        return token
+
+    @staticmethod
+    def add_user(code):
+        try:
+            token = DiscordOAuthManager._process_callback_code(code)['access_token']
+            logger.debug("Received token from OAuth")
+
+            custom_headers = {'accept': 'application/json', 'authorization': 'Bearer ' + token}
+            path = DISCORD_URL + "/invites/" + str(settings.DISCORD_INVITE_CODE)
+            r = requests.post(path, headers=custom_headers)
+            logger.debug("Got status code %s after accepting Discord invite" % r.status_code)
+            r.raise_for_status()
+
+            path = DISCORD_URL + "/users/@me"
+            r = requests.get(path, headers=custom_headers)
+            logger.debug("Got status code %s after retrieving Discord profile" % r.status_code)
+            r.raise_for_status()
+
+            user_id = r.json()['id']
+            logger.info("Added Discord user ID %s to server." % user_id)
+            return user_id
+        except:
+            logger.exception("Failed to add Discord user")
+            return None
+
+    @staticmethod
+    def update_nickname(user_id, nickname):
+        try:
+            custom_headers = {'content-type': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+            data = {'nick': nickname, }
+            path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/members/" + str(user_id)
+            r = requests.patch(path, headers=custom_headers, json=data)
+            logger.debug("Got status code %s after setting nickname for Discord user ID %s (%s)" % (
+                r.status_code, user_id, nickname))
+            if r.status_code == 404:
+                logger.warn("Discord user ID %s could not be found in server." % user_id)
+                return True
+            r.raise_for_status()
+            return True
+        except:
+            logger.exception("Failed to set nickname for Discord user ID %s (%s)" % (user_id, nickname))
+            return False
+
+    @staticmethod
+    def delete_user(user_id):
+        try:
+            custom_headers = {'accept': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+            path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/members/" + str(user_id)
+            r = requests.delete(path, headers=custom_headers)
+            logger.debug("Got status code %s after removing Discord user ID %s" % (r.status_code, user_id))
+            if r.status_code == 404:
+                logger.warn("Discord user ID %s already left the server." % user_id)
+                return True
+            r.raise_for_status()
+            return True
+        except:
+            logger.exception("Failed to remove Discord user ID %s" % user_id)
+            return False
+
+    @staticmethod
+    def __get_groups():
+        custom_headers = {'accept': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+        path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/roles"
+        r = requests.get(path, headers=custom_headers)
+        logger.debug("Got status code %s after retrieving Discord roles" % r.status_code)
+        r.raise_for_status()
+        return r.json()
+
+    @staticmethod
+    def __update_group_cache():
+        GroupCache.objects.filter(service="discord").delete()
+        cache = GroupCache.objects.create(service="discord")
+        cache.groups = json.dumps(DiscordOAuthManager.__get_groups())
+        cache.save()
+        return cache
+
+    @staticmethod
+    def __get_group_cache():
+        if not GroupCache.objects.filter(service="discord").exists():
+            DiscordOAuthManager.__update_group_cache()
+        cache = GroupCache.objects.get(service="discord")
+        age = timezone.now() - cache.created
+        if age > GROUP_CACHE_MAX_AGE:
+            logger.debug("Group cache has expired. Triggering update.")
+            cache = DiscordOAuthManager.__update_group_cache()
+        return json.loads(cache.groups)
+
+    @staticmethod
+    def __group_name_to_id(name):
+        cache = DiscordOAuthManager.__get_group_cache()
+        for g in cache:
+            if g['name'] == name:
+                return g['id']
+        logger.debug("Group %s not found on Discord. Creating" % name)
+        DiscordOAuthManager.__create_group(name)
+        return DiscordOAuthManager.__group_name_to_id(name)
+
+    @staticmethod
+    def __group_id_to_name(id):
+        cache = DiscordOAuthManager.__get_group_cache()
+        for g in cache:
+            if g['id'] == id:
+                return g['name']
+        raise KeyError("Group ID %s not found on Discord" % id)
+
+    @staticmethod
+    def __generate_role():
+        custom_headers = {'accept': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+        path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/roles"
+        r = requests.post(path, headers=custom_headers)
+        logger.debug("Received status code %s after generating new role." % r.status_code)
+        r.raise_for_status()
+        return r.json()
+
+    @staticmethod
+    def __edit_role(role_id, name, color=0, hoist=True, permissions=36785152):
+        custom_headers = {'content-type': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+        data = {
+            'color': color,
+            'hoist': hoist,
+            'name': name,
+            'permissions': permissions,
+        }
+        path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/roles/" + str(role_id)
+        r = requests.patch(path, headers=custom_headers, data=json.dumps(data))
+        logger.debug("Received status code %s after editing role id %s" % (r.status_code, role_id))
+        r.raise_for_status()
+        return r.json()
+
+    @staticmethod
+    def __create_group(name):
+        role = DiscordOAuthManager.__generate_role()
+        DiscordOAuthManager.__edit_role(role['id'], name)
+        DiscordOAuthManager.__update_group_cache()
+
+    @staticmethod
+    def update_groups(user_id, groups):
+        custom_headers = {'content-type': 'application/json', 'authorization': 'Bot ' + settings.DISCORD_BOT_TOKEN}
+        group_ids = [DiscordOAuthManager.__group_name_to_id(DiscordOAuthManager._sanitize_groupname(g)) for g in groups]
+        path = DISCORD_URL + "/guilds/" + str(settings.DISCORD_GUILD_ID) + "/members/" + str(user_id)
+        data = {'roles': group_ids}
+        r = requests.patch(path, headers=custom_headers, json=data)
+        logger.debug("Received status code %s after setting user roles" % r.status_code)
+        r.raise_for_status()

services/modules/discord/migrations/0001_initial.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-12-12 03:14
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0008_alter_user_username_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DiscordUser',
+            fields=[
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='discord', serialize=False, to=settings.AUTH_USER_MODEL)),
+                ('uid', models.CharField(max_length=254)),
+            ],
+        ),
+    ]

services/modules/discord/models.py

@@ -0,0 +1,15 @@
+from __future__ import unicode_literals
+from django.utils.encoding import python_2_unicode_compatible
+from django.contrib.auth.models import User
+from django.db import models
+
+
+class DiscordUser(models.Model):
+    user = models.OneToOneField(User,
+                                primary_key=True,
+                                on_delete=models.CASCADE,
+                                related_name='discord')
+    uid = models.CharField(max_length=254)
+
+    def __str__(self):
+        return "{} - {}".format(self.user.username, self.uid)

services/modules/discord/tasks.py

@@ -0,0 +1,131 @@
+from __future__ import unicode_literals
+
+import logging
+
+from alliance_auth.celeryapp import app
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+
+from eveonline.managers import EveManager
+from notifications import notify
+from services.modules.discord.manager import DiscordOAuthManager
+from services.tasks import only_one
+from .models import DiscordUser
+
+logger = logging.getLogger(__name__)
+
+
+class DiscordTasks:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def add_user(cls, user, code):
+        user_id = DiscordOAuthManager.add_user(code)
+        if user_id:
+            discord_user = DiscordUser()
+            discord_user.user = user
+            discord_user.uid = user_id
+            discord_user.save()
+            if settings.DISCORD_SYNC_NAMES:
+                cls.update_nickname.delay(user.pk)
+            cls.update_groups.delay(user.pk)
+            return True
+        return False
+
+    @classmethod
+    def delete_user(cls, user, notify_user=False):
+        if cls.has_account(user):
+            logger.debug("User %s has discord account %s. Deleting." % (user, user.discord.uid))
+            if DiscordOAuthManager.delete_user(user.discord.uid):
+                user.discord.delete()
+                if notify_user:
+                    notify(user, 'Discord Account Disabled', level='danger')
+                return True
+        return False
+
+    @classmethod
+    def has_account(cls, user):
+        """
+        Check if the user has an account (has a DiscordUser record)
+        :param user: django.contrib.auth.models.User
+        :return: bool
+        """
+        try:
+            user.discord
+        except ObjectDoesNotExist:
+            return False
+        else:
+            return True
+
+    @staticmethod
+    @app.task(bind=True)
+    def update_groups(task_self, pk):
+        user = User.objects.get(pk=pk)
+        logger.debug("Updating discord groups for user %s" % user)
+        if DiscordTasks.has_account(user):
+            groups = []
+            for group in user.groups.all():
+                groups.append(str(group.name))
+            if len(groups) == 0:
+                logger.debug("No syncgroups found for user. Adding empty group.")
+                groups.append('empty')
+            logger.debug("Updating user %s discord groups to %s" % (user, groups))
+            try:
+                DiscordOAuthManager.update_groups(user.discord.uid, groups)
+            except Exception as e:
+                if task_self:
+                    logger.exception("Discord group sync failed for %s, retrying in 10 mins" % user)
+                    raise task_self.retry(countdown=60 * 10)
+                else:
+                    # Rethrow
+                    raise e
+            logger.debug("Updated user %s discord groups." % user)
+        else:
+            logger.debug("User does not have a discord account, skipping")
+
+    @staticmethod
+    @app.task
+    def update_all_groups():
+        logger.debug("Updating ALL discord groups")
+        for discord_user in DiscordUser.objects.exclude(uid__exact=''):
+            DiscordTasks.update_groups.delay(discord_user.user.pk)
+
+    @staticmethod
+    @app.task(bind=True)
+    def update_nickname(self, pk):
+        user = User.objects.get(pk=pk)
+        logger.debug("Updating discord nickname for user %s" % user)
+        if DiscordTasks.has_account(user):
+            character = EveManager.get_main_character(user)
+            logger.debug("Updating user %s discord nickname to %s" % (user, character.character_name))
+            try:
+                DiscordOAuthManager.update_nickname(user.discord.uid, character.character_name)
+            except Exception as e:
+                if self:
+                    logger.exception("Discord nickname sync failed for %s, retrying in 10 mins" % user)
+                    raise self.retry(countdown=60 * 10)
+                else:
+                    # Rethrow
+                    raise e
+            logger.debug("Updated user %s discord nickname." % user)
+        else:
+            logger.debug("User %s does not have a discord account" % user)
+
+    @staticmethod
+    @app.task
+    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)
+
+    @classmethod
+    def disable(cls):
+        if settings.ENABLE_AUTH_DISCORD:
+            logger.warn(
+                "ENABLE_AUTH_DISCORD still True, after disabling users will still be able to link Discord accounts")
+        if settings.ENABLE_BLUE_DISCORD:
+            logger.warn(
+                "ENABLE_BLUE_DISCORD still True, after disabling blues will still be able to link Discord accounts")
+        DiscordUser.objects.all().delete()

services/modules/discord/templates/registered/discord_service_ctrl.html

@@ -0,0 +1,27 @@
+{% load i18n %}
+
+
+<tr>
+    <td class="text-center">Discord</td>
+    <td class="text-center"></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">
+        {% if not discord_uid %}
+            <a href="{% url 'auth_activate_discord' %}" class="btn btn-warning">
+                <span class="glyphicon glyphicon-ok"></span>
+            </a>
+        {% else %}
+            <a href="{% url 'auth_reset_discord' %}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-refresh"></span>
+            </a>
+            <a href="{% url 'auth_deactivate_discord' %}" class="btn btn-danger">
+                <span class="glyphicon glyphicon-remove"></span>
+            </a>
+        {% endif %}
+        {% if request.user.is_superuser %}
+            <div class="text-center" style="padding-top:5px;">
+                <a type="button" class="btn btn-success" href="{% url 'auth_discord_add_bot' %}">{% trans "Link Discord" %} Server</a>
+            </div>
+        {% endif %}
+    </td>
+</tr>

services/modules/discord/tests.py

@@ -0,0 +1,193 @@
+from __future__ import unicode_literals
+
+try:
+    # Py3
+    from unittest import mock
+except ImportError:
+    # Py2
+    import mock
+
+from django.test import TestCase, RequestFactory
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+
+from alliance_auth.tests.auth_utils import AuthUtils
+
+from .auth_hooks import DiscordService
+from .models import DiscordUser
+from .tasks import DiscordTasks
+
+MODULE_PATH = 'services.modules.discord'
+
+
+class DiscordHooksTestCase(TestCase):
+    def setUp(self):
+        self.member = 'member_user'
+        member = AuthUtils.create_member(self.member)
+        DiscordUser.objects.create(user=member, uid='12345')
+        self.blue = 'blue_user'
+        blue = AuthUtils.create_blue(self.blue)
+        DiscordUser.objects.create(user=blue, uid='67891')
+        self.none_user = 'none_user'
+        none_user = AuthUtils.create_user(self.none_user)
+        self.service = DiscordService
+
+    def test_has_account(self):
+        member = User.objects.get(username=self.member)
+        blue = User.objects.get(username=self.blue)
+        none_user = User.objects.get(username=self.none_user)
+        self.assertTrue(DiscordTasks.has_account(member))
+        self.assertTrue(DiscordTasks.has_account(blue))
+        self.assertFalse(DiscordTasks.has_account(none_user))
+
+    def test_service_enabled(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        blue = User.objects.get(username=self.blue)
+        none_user = User.objects.get(username=self.none_user)
+        self.assertTrue(service.service_enabled_members())
+        self.assertTrue(service.service_enabled_blues())
+
+        self.assertTrue(service.service_active_for_user(member))
+        self.assertTrue(service.service_active_for_user(blue))
+        self.assertFalse(service.service_active_for_user(none_user))
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_update_all_groups(self, manager):
+        service = self.service()
+        service.update_all_groups()
+        # Check member and blue user have groups updated
+        self.assertTrue(manager.update_groups.called)
+        self.assertEqual(manager.update_groups.call_count, 2)
+
+    def test_update_groups(self):
+        # Check member has Member group updated
+        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
+            service = self.service()
+            member = User.objects.get(username=self.member)
+            service.update_groups(member)
+            self.assertTrue(manager.update_groups.called)
+            args, kwargs = manager.update_groups.call_args
+            user_id, groups = args
+            self.assertIn(settings.DEFAULT_AUTH_GROUP, groups)
+            self.assertEqual(user_id, member.discord.uid)
+
+        # Check none user does not have groups updated
+        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
+            service = self.service()
+            none_user = User.objects.get(username=self.none_user)
+            service.update_groups(none_user)
+            self.assertFalse(manager.update_groups.called)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_validate_user(self, manager):
+        service = self.service()
+        # Test member is not deleted
+        member = User.objects.get(username=self.member)
+        service.validate_user(member)
+        self.assertTrue(member.discord)
+
+        # Test none user is deleted
+        none_user = User.objects.get(username=self.none_user)
+        DiscordUser.objects.create(user=none_user, uid='abc123')
+        service.validate_user(none_user)
+        self.assertTrue(manager.delete_user.called)
+        with self.assertRaises(ObjectDoesNotExist):
+            none_discord = User.objects.get(username=self.none_user).discord
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_sync_nickname(self, manager):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        AuthUtils.add_main_character(member, 'test user', '12345', corp_ticker='AAUTH')
+
+        service.sync_nickname(member)
+
+        self.assertTrue(manager.update_nickname.called)
+        args, kwargs = manager.update_nickname.call_args
+        self.assertEqual(args[0], member.discord.uid)
+        self.assertEqual(args[1], 'test user')
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_delete_user(self, manager):
+        member = User.objects.get(username=self.member)
+
+        service = self.service()
+        result = service.delete_user(member)
+
+        self.assertTrue(result)
+        self.assertTrue(manager.delete_user.called)
+        with self.assertRaises(ObjectDoesNotExist):
+            discord_user = User.objects.get(username=self.member).discord
+
+    def test_render_services_ctrl(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        request = RequestFactory().get('/en/services/')
+        request.user = member
+
+        response = service.render_services_ctrl(request)
+        self.assertTemplateUsed(service.service_ctrl_template)
+        self.assertIn('/discord/reset/', response)
+        self.assertIn('/discord/deactivate/', response)
+
+        # Test register becomes available
+        member.discord.delete()
+        member = User.objects.get(username=self.member)
+        request.user = member
+        response = service.render_services_ctrl(request)
+        self.assertIn('/discord/activate/', response)
+
+    # TODO: Test update nicknames
+
+
+class DiscordViewsTestCase(TestCase):
+    def setUp(self):
+        self.member = AuthUtils.create_member('auth_member')
+        self.member.set_password('password')
+        self.member.save()
+
+    def login(self):
+        self.client.login(username=self.member.username, password='password')
+
+    @mock.patch(MODULE_PATH + '.views.DiscordOAuthManager')
+    def test_activate(self, manager):
+        self.login()
+        manager.generate_oauth_redirect_url.return_value = '/example.com/oauth/'
+        response = self.client.get('/discord/activate/', follow=False)
+        self.assertRedirects(response, expected_url='/example.com/oauth/', target_status_code=404)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_callback(self, manager):
+        self.login()
+        manager.add_user.return_value = '1234'
+        response = self.client.get('/discord/callback/', data={'code': '1234'})
+
+        self.assertTrue(manager.add_user.called)
+        self.assertEqual(manager.update_nickname.called, settings.DISCORD_SYNC_NAMES)
+        self.assertEqual(self.member.discord.uid, '1234')
+        self.assertRedirects(response, expected_url='/en/services/', target_status_code=200)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_reset(self, manager):
+        self.login()
+        DiscordUser.objects.create(user=self.member, uid='12345')
+        manager.delete_user.return_value = True
+
+        response = self.client.get('/discord/reset/')
+
+        self.assertRedirects(response, expected_url='/discord/activate/', target_status_code=302)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_deactivate(self, manager):
+        self.login()
+        DiscordUser.objects.create(user=self.member, uid='12345')
+        manager.delete_user.return_value = True
+
+        response = self.client.get('/discord/deactivate/')
+
+        self.assertTrue(manager.delete_user.called)
+        self.assertRedirects(response, expected_url='/en/services/', target_status_code=200)
+        with self.assertRaises(ObjectDoesNotExist):
+            discord_user = User.objects.get(pk=self.member.pk).discord

services/modules/discord/urls.py

@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+from django.conf.urls import url, include
+
+from . import views
+
+module_urls = [
+    # Discord Service Control
+    url(r'^activate/$', views.activate_discord, name='auth_activate_discord'),
+    url(r'^deactivate/$', views.deactivate_discord, name='auth_deactivate_discord'),
+    url(r'^reset/$', views.reset_discord, name='auth_reset_discord'),
+    url(r'^callback/$', views.discord_callback, name='auth_discord_callback'),
+    url(r'^add_bot/$', views.discord_add_bot, name='auth_discord_add_bot'),
+]
+
+urlpatterns = [
+    url(r'^discord/', include(module_urls))
+]

services/modules/discord/views.py

@@ -0,0 +1,71 @@
+from __future__ import unicode_literals
+
+import logging
+
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import user_passes_test
+from django.shortcuts import redirect
+
+from authentication.decorators import members_and_blues
+from .manager import DiscordOAuthManager
+from .tasks import DiscordTasks
+from services.views import superuser_test
+
+
+logger = logging.getLogger(__name__)
+
+
+@login_required
+@members_and_blues()
+def deactivate_discord(request):
+    logger.debug("deactivate_discord called by user %s" % request.user)
+    if DiscordTasks.delete_user(request.user):
+        logger.info("Successfully deactivated discord for user %s" % request.user)
+        messages.success(request, 'Deactivated Discord account.')
+    else:
+        logger.error("Unsuccessful attempt to deactivate discord for user %s" % request.user)
+        messages.error(request, 'An error occurred while processing your Discord account.')
+    return redirect("auth_services")
+
+
+@login_required
+@members_and_blues()
+def reset_discord(request):
+    logger.debug("reset_discord called by user %s" % request.user)
+    if DiscordTasks.delete_user(request.user):
+        logger.info("Successfully deleted discord user for user %s - forwarding to discord activation." % request.user)
+        return redirect("auth_activate_discord")
+    logger.error("Unsuccessful attempt to reset discord for user %s" % request.user)
+    messages.error(request, 'An error occurred while processing your Discord account.')
+    return redirect("auth_services")
+
+
+@login_required
+@members_and_blues()
+def activate_discord(request):
+    logger.debug("activate_discord called by user %s" % request.user)
+    return redirect(DiscordOAuthManager.generate_oauth_redirect_url())
+
+
+@login_required
+@members_and_blues()
+def discord_callback(request):
+    logger.debug("Received Discord callback for activation of user %s" % request.user)
+    code = request.GET.get('code', None)
+    if not code:
+        logger.warn("Did not receive OAuth code from callback of user %s" % request.user)
+        return redirect("auth_services")
+    if DiscordTasks.add_user(request.user, code):
+        logger.info("Successfully activated Discord for user %s" % request.user)
+        messages.success(request, 'Activated Discord account.')
+    else:
+        logger.error("Failed to activate Discord for user %s" % request.user)
+        messages.error(request, 'An error occurred while processing your Discord account.')
+    return redirect("auth_services")
+
+
+@login_required
+@user_passes_test(superuser_test)
+def discord_add_bot(request):
+    return redirect(DiscordOAuthManager.generate_bot_add_url())