mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-11 05:20:16 +02:00
* Add service access permissions and migration `ENABLE_AUTH_<servicename> = True` will have the new permission applied to the settings configured `DEFAULT_AUTH_GROUP` group or `Member` if none is configured. `ENABLE_BLUE_<servicename> = True` will have the new permission applied to the settings configured `DEFAULT_BLUE_GROUP` group or `Blue` if none is configured. * Move views and hooks to permissions based access * Remove access restriction to services view Hypothetically non-member/blues could be granted permission to access services manually as desired now. A user that has no permissions to access any services will see a blank services list. * Remove obsolete service settings * Remove references to obsolete settings * Adjusted tests to support permissions based access * Fix incorrectly named permissions * Add simple get_services generator function * Added signals for user and groups perm changes * Update validate_services to support permissions deactivate_services removed as its surplus to requirements. * Removed state parameter from validate_services calls * Update tests to support signals changes * Fix incorrect call to validate_services task * Fix validate_services and test * Add validate_user to changed user groups signal * Added tests for new signals * Remove unnecessary post_add signals * Added documentation for service permissions * Added detection for members with service active If there are any service users in the Member or Blue groups active, then the permission will be added to the respective Member or Blue group. This means its no longer necessary to maintain the service enablesettings to migrate to permissions based service. Remove obsolete state based status checking
74 lines
2.7 KiB
Python
74 lines
2.7 KiB
Python
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.contrib.auth.decorators import permission_required
|
|
from django.shortcuts import redirect
|
|
|
|
from .manager import DiscordOAuthManager
|
|
from .tasks import DiscordTasks
|
|
from services.views import superuser_test
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
ACCESS_PERM = 'discord.access_discord'
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
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
|
|
@permission_required(ACCESS_PERM)
|
|
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
|
|
@permission_required(ACCESS_PERM)
|
|
def activate_discord(request):
|
|
logger.debug("activate_discord called by user %s" % request.user)
|
|
return redirect(DiscordOAuthManager.generate_oauth_redirect_url())
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
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())
|