mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-06 07:06:19 +01:00
EVE Swagger Interface
Closes #591 Conflicts: authentication/views.py eveonline/views.py stock/templates/public/characternotexisting.html
This commit is contained in:
@@ -19,5 +19,5 @@ def states(request):
|
||||
|
||||
def sso(request):
|
||||
return {
|
||||
'EVE_SSO_CALLBACK_URL': settings.EVE_SSO_CALLBACK_URL,
|
||||
'EVE_SSO_CALLBACK_URL': settings.ESI_SSO_CALLBACK_URL,
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ from authentication.models import AuthServicesInfo
|
||||
from authentication.forms import LoginForm, RegistrationForm
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib import messages
|
||||
from eve_sso.decorators import token_required
|
||||
from esi.decorators import token_required
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -95,13 +95,14 @@ def help_view(request):
|
||||
|
||||
|
||||
@token_required(new=True)
|
||||
def sso_login(request, tokens=[]):
|
||||
token = tokens[0]
|
||||
def sso_login(request, token):
|
||||
try:
|
||||
char = EveCharacter.objects.get(character_id=token.character_id)
|
||||
if char.user:
|
||||
if char.user.is_active:
|
||||
login(request, char.user)
|
||||
token.user = char.user
|
||||
token.save()
|
||||
return redirect('auth_dashboard')
|
||||
else:
|
||||
messages.error(request, 'Your account has been disabled.')
|
||||
|
||||
Reference in New Issue
Block a user