diff --git a/eveonline/views.py b/eveonline/views.py index b377a2e1..24457e1b 100755 --- a/eveonline/views.py +++ b/eveonline/views.py @@ -47,7 +47,7 @@ def add_api_key(request): owner = request.user # Grab characters associated with the key pair characters = EveManager.get_characters_from_api(api_key) - [EveManager.create_character(c.id, owner, api_key.api_id) for c in characters if not EveCharacter.objects.filter(character_id=c.id).exists()] + [EveManager.create_character_obj(c, owner, api_key.api_id) for c in characters if not EveCharacter.objects.filter(character_id=c.id).exists()] logger.info("Successfully processed api add form for user %s" % request.user) if not settings.API_SSO_VALIDATION: messages.success(request, 'Added API key %s to your account.' % form.cleaned_data['api_id']) diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py index a61a3c6b..840442c9 100644 --- a/services/managers/eve_api_manager.py +++ b/services/managers/eve_api_manager.py @@ -319,7 +319,6 @@ class EveApiManager: def validate_api(api_id, api_key, user): try: info = EveApiManager.get_api_info(api_id, api_key).result - chars = EveApiManager.get_characters_from_api(api_id, api_key).result except evelink.api.APIError as e: if int(e.code) == 222: raise EveApiManager.ApiInvalidError(api_id) @@ -329,6 +328,7 @@ class EveApiManager: auth, c = AuthServicesInfo.objects.get_or_create(user=user) states = [auth.state] from authentication.tasks import determine_membership_by_character # circular import issue + chars = info['characters'] for char in chars: evechar = EveCharacter() evechar.character_name = chars[char]['name']