first attempt to make expiration date optional

Author: dbgold17

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

@@ -130,17 +130,17 @@ 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, Union[str, int, None]]:
         """
-        Returns the refresh token and its expiration datetime
+        Returns the refreshed access token and its expiration datetime
 
         :return: a tuple of (access_token, token_lifespan)
         """
         response_json = self._make_handled_request()
         self._ensure_access_token_in_response(response_json)
 
         return (
-            self._extract_access_token(response_json),
+            str(self._extract_access_token(response_json)),
             self._extract_token_expiry_date(response_json),
         )
 
@@ -184,7 +184,7 @@ def _wrap_refresh_token_exception(
         ),
         max_time=300,
     )
-    def _make_handled_request(self) -> Any:
+    def _make_handled_request(self) -> Mapping[str, Any]:
         """
         Makes a handled HTTP request to refresh an OAuth token.
 
@@ -292,41 +292,44 @@ def _extract_access_token(self, response_data: Mapping[str, Any]) -> Any:
             response_data (Mapping[str, Any]): The response data from which to extract the access token.
 
         Returns:
-            str: The extracted access token.
+            str: The extracted access token or None if not found.
         """
-        return self._find_and_get_value_from_response(response_data, self.get_access_token_name())
+        access_token = self._find_and_get_value_from_response(response_data, self.get_access_token_name())
+        return str(access_token) if access_token is not None else None
 
-    def _extract_refresh_token(self, response_data: Mapping[str, Any]) -> Any:
+    def _extract_refresh_token(self, response_data: Mapping[str, Any]) -> str | None:
         """
         Extracts the refresh token from the given response data.
 
         Args:
             response_data (Mapping[str, Any]): The response data from which to extract the refresh token.
 
         Returns:
-            str: The extracted refresh token.
+            str: The extracted refresh token or None if not found.
         """
-        return self._find_and_get_value_from_response(response_data, self.get_refresh_token_name())
+        refresh_token = self._find_and_get_value_from_response(response_data, self.get_refresh_token_name())
+        return str(refresh_token) if refresh_token is not None else None
 
-    def _extract_token_expiry_date(self, response_data: Mapping[str, Any]) -> Any:
+    def _extract_token_expiry_date(self, response_data: Mapping[str, Any]) -> str | None:
         """
         Extracts the token_expiry_date, like `expires_in` or `expires_at`, etc from the given response data.
 
         Args:
             response_data (Mapping[str, Any]): The response data from which to extract the token_expiry_date.
 
         Returns:
-            str: The extracted token_expiry_date.
+            str: 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())
+        token_expiry_date = self._find_and_get_value_from_response(response_data, self.get_expires_in_name())
+        return str(token_expiry_date) if token_expiry_date is not None else None
 
     def _find_and_get_value_from_response(
         self,
         response_data: Mapping[str, Any],
         key_name: str,
         max_depth: int = 5,
         current_depth: int = 0,
-    ) -> Any:
+    ) -> Any | None:
         """
         Recursively searches for a specified key in a nested dictionary or list and returns its value if found.
 

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

@@ -346,16 +346,17 @@ def get_access_token(self) -> str:
             new_access_token, access_token_expires_in, new_refresh_token = (
                 self.refresh_access_token()
             )
-            new_token_expiry_date: AirbyteDateTime = self.get_new_token_expiry_date(
-                access_token_expires_in, self._token_expiry_date_format
-            )
+            if access_token_expires_in is not None:
+                new_token_expiry_date: AirbyteDateTime = self.get_new_token_expiry_date(
+                    access_token_expires_in, self._token_expiry_date_format
+                )
+                self.set_token_expiry_date(new_token_expiry_date)
             self.access_token = new_access_token
             self.set_refresh_token(new_refresh_token)
-            self.set_token_expiry_date(new_token_expiry_date)
             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, str | None, str]:  # type: ignore[override]
         """
         Refreshes the access token by making a handled request and extracting the necessary token information.