mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-12 14:00:17 +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
109 lines
4.9 KiB
Python
109 lines
4.9 KiB
Python
from __future__ import unicode_literals
|
|
|
|
from django.contrib import messages
|
|
from django.contrib.auth.decorators import login_required, permission_required
|
|
from django.shortcuts import render, redirect
|
|
|
|
from services.forms import ServicePasswordForm
|
|
from eveonline.managers import EveManager
|
|
|
|
from .manager import MarketManager
|
|
from .models import MarketUser
|
|
from .tasks import MarketTasks
|
|
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
ACCESS_PERM = 'market.access_market'
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
def activate_market(request):
|
|
logger.debug("activate_market called by user %s" % request.user)
|
|
character = EveManager.get_main_character(request.user)
|
|
if character is not None:
|
|
logger.debug("Adding market user for user %s with main character %s" % (request.user, character))
|
|
result = MarketManager.add_user(character.character_name, request.user.email, character.character_id,
|
|
character.character_name)
|
|
# if empty we failed
|
|
if result[0] != "":
|
|
MarketUser.objects.create(user=request.user, username=result[0])
|
|
logger.debug("Updated authserviceinfo for user %s with market credentials." % request.user)
|
|
logger.info("Successfully activated market for user %s" % request.user)
|
|
messages.success(request, 'Activated Alliance Market account.')
|
|
credentials = {
|
|
'username': result[0],
|
|
'password': result[1],
|
|
}
|
|
return render(request, 'registered/service_credentials.html',
|
|
context={'credentials': credentials, 'service': 'Alliance Market'})
|
|
logger.error("Unsuccessful attempt to activate market for user %s" % request.user)
|
|
messages.error(request, 'An error occurred while processing your Alliance Market account.')
|
|
return redirect("auth_services")
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
def deactivate_market(request):
|
|
logger.debug("deactivate_market called by user %s" % request.user)
|
|
# false we failed
|
|
if MarketTasks.delete_user(request.user):
|
|
logger.info("Successfully deactivated market for user %s" % request.user)
|
|
messages.success(request, 'Deactivated Alliance Market account.')
|
|
else:
|
|
logger.error("Unsuccessful attempt to activate market for user %s" % request.user)
|
|
messages.error(request, 'An error occurred while processing your Alliance Market account.')
|
|
return redirect("auth_services")
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
def reset_market_password(request):
|
|
logger.debug("reset_market_password called by user %s" % request.user)
|
|
if MarketTasks.has_account(request.user):
|
|
result = MarketManager.update_user_password(request.user.market.username)
|
|
# false we failed
|
|
if result != "":
|
|
logger.info("Successfully reset market password for user %s" % request.user)
|
|
messages.success(request, 'Reset Alliance Market password.')
|
|
credentials = {
|
|
'username': request.user.market.username,
|
|
'password': result,
|
|
}
|
|
return render(request, 'registered/service_credentials.html',
|
|
context={'credentials': credentials, 'service': 'Alliance Market'})
|
|
|
|
logger.error("Unsuccessful attempt to reset market password for user %s" % request.user)
|
|
messages.error(request, 'An error occurred while processing your Alliance Market account.')
|
|
return redirect("auth_services")
|
|
|
|
|
|
@login_required
|
|
@permission_required(ACCESS_PERM)
|
|
def set_market_password(request):
|
|
logger.debug("set_market_password called by user %s" % request.user)
|
|
if request.method == 'POST':
|
|
logger.debug("Received POST request with form.")
|
|
form = ServicePasswordForm(request.POST)
|
|
logger.debug("Form is valid: %s" % form.is_valid())
|
|
if form.is_valid() and MarketTasks.has_account(request.user):
|
|
password = form.cleaned_data['password']
|
|
logger.debug("Form contains password of length %s" % len(password))
|
|
result = MarketManager.update_custom_password(request.user.market.username, password)
|
|
if result != "":
|
|
logger.info("Successfully reset market password for user %s" % request.user)
|
|
messages.success(request, 'Set Alliance Market password.')
|
|
else:
|
|
logger.error("Failed to install custom market password for user %s" % request.user)
|
|
messages.error(request, 'An error occurred while processing your Alliance Market account.')
|
|
return redirect("auth_services")
|
|
else:
|
|
logger.debug("Request is not type POST - providing empty form.")
|
|
form = ServicePasswordForm()
|
|
|
|
logger.debug("Rendering form for user %s" % request.user)
|
|
context = {'form': form, 'service': 'Market'}
|
|
return render(request, 'registered/service_password.html', context=context)
|