minimal change to insert default expiration

Author: dbgold17

airbyte_cdk/sources/declarative/auth/oauth.py

@@ -239,7 +239,7 @@ def get_token_expiry_date(self) -> AirbyteDateTime:
     def _has_access_token_been_initialized(self) -> bool:
         return self._access_token is not None
 
-    def set_token_expiry_date(self, value: Union[str, int]) -> None:
+    def set_token_expiry_date(self, value: AirbyteDateTime) -> None:
         self._token_expiry_date = self._parse_token_expiration_date(value)
 
     def get_assertion_name(self) -> str:

airbyte_cdk/sources/streams/http/requests_native_auth/abstract_oauth.py

@@ -130,7 +130,7 @@ def build_refresh_request_headers(self) -> Mapping[str, Any] | None:
         headers = self.get_refresh_request_headers()
         return headers if headers else None
 
-    def refresh_access_token(self) -> Tuple[str, Union[str, int]]:
+    def refresh_access_token(self) -> Tuple[str, Optional[str]]:
         """
         Returns the refresh token and its expiration datetime
 
@@ -147,6 +147,15 @@ def refresh_access_token(self) -> Tuple[str, Union[str, int]]:
     # ----------------
     # PRIVATE METHODS
     # ----------------
+    
+    def _default_token_expiry_date(self) -> str:
+        """
+        Returns the default token expiry date
+        """
+        if self.token_expiry_is_time_of_expiration:
+            return str(ab_datetime_now() + timedelta(hours=1))
+        else:
+            return "3600"
 
     def _wrap_refresh_token_exception(
         self, exception: requests.exceptions.RequestException
@@ -316,9 +325,15 @@ def _extract_token_expiry_date(self, response_data: Mapping[str, Any]) -> Any:
             response_data (Mapping[str, Any]): The response data from which to extract the token_expiry_date.
 
         Returns:
-            str: The extracted token_expiry_date.
+            The extracted token_expiry_date or None if not found.
         """
-        return self._find_and_get_value_from_response(response_data, self.get_expires_in_name())
+        expires_in = self._find_and_get_value_from_response(response_data, self.get_expires_in_name())
+        # If the access token expires in is None, we do not know when the token will expire
+        # 1 hour was chosen as a middle ground to avoid unnecessary frequent refreshes and token expiration
+        if expires_in is None:
+            return self._default_token_expiry_date()
+        else:
+            return expires_in
 
     def _find_and_get_value_from_response(
         self,

airbyte_cdk/sources/streams/http/requests_native_auth/oauth.py

@@ -355,7 +355,7 @@ def get_access_token(self) -> str:
             self._emit_control_message()
         return self.access_token
 
-    def refresh_access_token(self) -> Tuple[str, str, str]:  # type: ignore[override]
+    def refresh_access_token(self) -> Tuple[str, Optional[str], str]:  # type: ignore[override]
         """
         Refreshes the access token by making a handled request and extracting the necessary token information.