gdrive upload: fixed oauth access token renewal

diff --git a/motioneye/__init__.py b/motioneye/__init__.py
index 47b450041dd43d95b788a6f2c75688e943447d72..b9cb08a62a151f27cc4f87d02f51df653acc7494 100644 (file)
--- a/motioneye/__init__.py
+++ b/motioneye/__init__.py
@@ -1,2 +1,2 @@
 
-VERSION = "0.28.3"
+VERSION = "0.28.4-git"

diff --git a/motioneye/uploadservices.py b/motioneye/uploadservices.py
index 2e427ca4e74c887e97171840937ec0f3a6a960c4..3f520d4e256be6b5fd886355e5cba28af144eb2f 100644 (file)
--- a/motioneye/uploadservices.py
+++ b/motioneye/uploadservices.py
@@ -221,7 +221,7 @@ class GoogleDrive(UploadService):
         
         return items[0]['id']
 
-    def _request(self, url, body=None, headers=None):
+    def _request(self, url, body=None, headers=None, retry_auth=True):
         if not self._authorization_key:
             msg = 'missing authorization key'
             self.error(msg)
@@ -247,11 +247,12 @@ class GoogleDrive(UploadService):
             response = urllib2.urlopen(request)
         
         except urllib2.HTTPError as e:
-            if e.code == 403: # unauthorized, access token may have expired
+            if e.code == 401 and retry_auth: # unauthorized, access token may have expired
                 try:
-                    self.debug('access token might have expired, refreshing it')
+                    self.debug('access token has probably expired, refreshing it')
                     self._credentials.refresh(httplib2.Http())
                     save()
+                    self._request(url, body, headers, retry_auth=False)
 
                 except Exception as e:
                     self.error('refreshing access token failed')