Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly throw ApiInvalidError when API key deleted (222)

Browse Source 
Do not assume keys are invalid on unrecognized codes.
Closes #574
This commit is contained in:
Adarnof 2016-11-05 20:47:51 -04:00
parent dc4b4bbdf5
commit b4dc624b17
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eveonline/forms.py
View File

@ -46,7 +46,4 @@ class UpdateKeyForm(forms.Form):
raise forms.ValidationError(str(e)) raise forms.ValidationError(str(e))
except evelink.api.APIError as e: except evelink.api.APIError as e:
logger.debug("Got error code %s while validating API %s" % (e.code, self.cleaned_data['api_id'])) logger.debug("Got error code %s while validating API %s" % (e.code, self.cleaned_data['api_id']))
if int(e.code) in [221, 222]: raise forms.ValidationError('Error while checking API key (%s)' % e.code)
raise forms.ValidationError("API key failed validation")
else:
raise forms.ValidationError("Failed to reach API servers")

6
services/managers/eve_api_manager.py
View File

@ -321,13 +321,11 @@ class EveApiManager:
info = EveApiManager.get_api_info(api_id, api_key).result info = EveApiManager.get_api_info(api_id, api_key).result
chars = EveApiManager.get_characters_from_api(api_id, api_key).result chars = EveApiManager.get_characters_from_api(api_id, api_key).result
except evelink.api.APIError as e: except evelink.api.APIError as e:
if int(e.code) in [221, 222]: if int(e.code) == 222:
raise e
raise EveApiManager.ApiInvalidError(api_id) raise EveApiManager.ApiInvalidError(api_id)
raise e
except (requests.exceptions.RequestExeception, HTTPError, URLError) as e: except (requests.exceptions.RequestExeception, HTTPError, URLError) as e:
raise EveApiManager.ApiServerUnreachableError(e) raise EveApiManager.ApiServerUnreachableError(e)
except Exception:
raise EveApiManager.ApiInvalidError(api_id)
auth, c = AuthServicesInfo.objects.get_or_create(user=user) auth, c = AuthServicesInfo.objects.get_or_create(user=user)
states = [auth.state] states = [auth.state]
from authentication.tasks import determine_membership_by_character # circular import issue from authentication.tasks import determine_membership_by_character # circular import issue