Merge pull request #133 from omarryhan/fix-refresh-error

Fix refresh error

aiogoogle/__version__.py

@@ -2,7 +2,7 @@
 __about__ = "Async Google API client"
 __description__ = __about__
 __url__ = "https://github.com/omarryhan/aiogoogle"
-__version_info__ = ("5", "5", "0")
+__version_info__ = ("5", "6", "0")
 __version__ = ".".join(__version_info__)
 __author__ = "Omar Ryhan"
 __author_email__ = "[email protected]"

aiogoogle/auth/managers.py

@@ -626,7 +626,7 @@ async def refresh(self, user_creds, client_creds=None):
         """
         client_creds = client_creds or self.client_creds
 
-        if not self.is_expired(user_creds):
+        if user_creds.get("expires_at") and not self.is_expired(user_creds):
             return False, user_creds
 
         request = self._build_refresh_request(user_creds, client_creds)

aiogoogle/client.py

@@ -240,14 +240,12 @@ async def as_user(self, *requests, timeout=None, full_res=False, user_creds=None
         if user_creds is None:
             raise TypeError("No user credentials were found")
 
-        # Refresh credentials
-        if user_creds.get("expires_at") is None:
-            is_refreshed, user_creds = await self.oauth2.refresh(
-                user_creds, client_creds=self.client_creds
-            )
-            # Set refreshed user_creds if ones were already existing
-            if is_refreshed and self.user_creds is not None:
-                self.user_creds = user_creds
+        is_refreshed, user_creds = await self.oauth2.refresh(
+            user_creds, client_creds=self.client_creds
+        )
+        # Set refreshed user_creds if ones already exist
+        if is_refreshed and self.user_creds is not None:
+            self.user_creds = user_creds
 
         authorized_requests = [
             self.oauth2.authorize(request, user_creds) for request in requests