From 6ee61862802a9b7c4c6b9b902a628b11d312db67 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 25 Oct 2015 19:51:58 -0400 Subject: [PATCH] Make a post thing for pycrest. Still having authentication errors occasionally. --- service/crest.py | 2 +- service/pycrest/eve.py | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/service/crest.py b/service/crest.py index 82ca47b69..47a900773 100644 --- a/service/crest.py +++ b/service/crest.py @@ -86,7 +86,7 @@ class Crest(): def postFitting(self, charID, json): char = self.getCrestCharacter(charID) - res = char.eve._session.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json) + res = char.eve.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json) return res def logout(self): diff --git a/service/pycrest/eve.py b/service/pycrest/eve.py index e56bfc927..51b25970c 100644 --- a/service/pycrest/eve.py +++ b/service/pycrest/eve.py @@ -265,18 +265,15 @@ class AuthedConnection(EVE): # self._cache['whoami'] = self.get("%s/verify" % self._oauth_endpoint) return self.get("%s/verify" % self._oauth_endpoint) - def refresh(self): - res = self._authorize(params={"grant_type": "refresh_token", "refresh_token": self.refresh_token}) - self.token = res['access_token'] - self.expires = int(time.time()) + res['expires_in'] - self._session.headers.update({"Authorization": "Bearer %s" % self.token}) - return self # for backwards compatibility - def get(self, resource, params=None): if self.refresh_token and int(time.time()) >= self.expires: - self.refresh() + self.refr_authorize(self.refresh_token) return super(self.__class__, self).get(resource, params) + def post(self, resource, data, params=None): + if self.refresh_token and int(time.time()) >= self.expires: + self.refr_authorize(self.refresh_token) + return self._session.post(resource, data=data, params=params) class APIObject(object): def __init__(self, parent, connection):