estuary-cdk: OAuth2RotatingTokenSpec merged into OAuth2Spec

Author: nicolaslazo

estuary-cdk/estuary_cdk/capture/common.py

@@ -29,7 +29,6 @@
     CaptureBinding,
     ClientCredentialsOAuth2Credentials,
     OAuth2TokenFlowSpec,
-    OAuth2RotatingTokenSpec,
     AuthorizationCodeFlowOAuth2Credentials,
     LongLivedClientCredentialsOAuth2Credentials,
     ResourceOwnerPasswordOAuth2Credentials,

estuary-cdk/estuary_cdk/flow.py

@@ -74,6 +74,7 @@ class Checkpoint(BaseModel):
 class OAuth2TokenFlowSpec(BaseModel):
     accessTokenResponseMap: dict[str, str]
     accessTokenUrlTemplate: str
+    additionalTokenExchangeBody: dict[str, str | int] = {}
 
 
 class OAuth2Spec(BaseModel):
@@ -83,10 +84,7 @@ class OAuth2Spec(BaseModel):
     accessTokenHeaders: dict[str, str]
     accessTokenResponseMap: dict[str, str]
     accessTokenUrlTemplate: str
-
-
-class OAuth2RotatingTokenSpec(OAuth2Spec):
-    additionalTokenExchangeBody: dict[str, str | int] | None
+    additionalTokenExchangeBody: dict[str, str | int] = {}
 
 
 class ConnectorSpec(BaseModel):

estuary-cdk/estuary_cdk/http.py

@@ -23,7 +23,6 @@
     GoogleServiceAccount,
     GoogleServiceAccountSpec,
     LongLivedClientCredentialsOAuth2Credentials,
-    OAuth2RotatingTokenSpec,
     OAuth2Spec,
     OAuth2TokenFlowSpec,
     ResourceOwnerPasswordOAuth2Credentials,
@@ -221,7 +220,7 @@ class AccessTokenResponse(BaseModel):
         refresh_token: str = ""
         scope: str = ""
 
-    oauth_spec: OAuth2Spec | OAuth2TokenFlowSpec | OAuth2RotatingTokenSpec | None
+    oauth_spec: OAuth2Spec | OAuth2TokenFlowSpec | None
     credentials: (
         BaseOAuth2Credentials
         | RotatingOAuth2Credentials
@@ -368,26 +367,13 @@ async def _fetch_oauth2_token(
                     f"Unsupported client credentials placement: {credentials.client_credentials_placement}."
                 )
 
-        match credentials:
-            case RotatingOAuth2Credentials():
-                assert isinstance(self.oauth_spec, OAuth2RotatingTokenSpec)
-                form["refresh_token"] = credentials.refresh_token
-
-                # Some providers require additional parameters within the form body, like
-                # an `expires_in` to configure how long the access token remains valid.
-                if self.oauth_spec.additionalTokenExchangeBody:
-                    form.update(self.oauth_spec.additionalTokenExchangeBody)
-
-            case BaseOAuth2Credentials():
-                form["refresh_token"] = credentials.refresh_token
-            case (
-                ClientCredentialsOAuth2Credentials()
-                | AuthorizationCodeFlowOAuth2Credentials()
-                | ResourceOwnerPasswordOAuth2Credentials()
-            ):
-                pass
-            case _:
-                raise TypeError(f"Unsupported credentials type: {type(credentials)}.")
+        # Some providers require additional parameters within the form body, like
+        # an `expires_in` to configure how long the access token remains valid.
+        form.update(self.oauth_spec.additionalTokenExchangeBody)
+
+        if isinstance(credentials, BaseOAuth2Credentials):
+            assert isinstance(self.oauth_spec, OAuth2Spec)
+            form["refresh_token"] = credentials.refresh_token
 
         response = await session.request(
             log,

source-outreach/source_outreach/models.py

@@ -7,7 +7,7 @@
 from estuary_cdk.capture.common import (
     BaseDocument,
     RotatingOAuth2Credentials,
-    OAuth2RotatingTokenSpec,
+    OAuth2Spec,
     ResourceConfig,
     ResourceState,
 )
@@ -91,7 +91,7 @@ def urlencode_field(field: str):
 }
 
 
-OAUTH2_SPEC = OAuth2RotatingTokenSpec(
+OAUTH2_SPEC = OAuth2Spec(
     provider="outreach",
     accessTokenBody=json.dumps(accessTokenBody),
     authUrlTemplate=(
@@ -111,7 +111,6 @@ def urlencode_field(field: str):
     accessTokenHeaders={
         "Content-Type": "application/json",
     },
-    additionalTokenExchangeBody=None,
 )
 
 

source-zendesk-support-native/source_zendesk_support_native/models.py

@@ -8,7 +8,7 @@
     BaseDocument,
     LongLivedClientCredentialsOAuth2Credentials,
     RotatingOAuth2Credentials,
-    OAuth2RotatingTokenSpec,
+    OAuth2Spec,
     ResourceConfig,
     ResourceState,
 )
@@ -47,7 +47,7 @@ def urlencode_field(field: str):
     "expires_in": MAX_VALID_ACCESS_TOKEN_DURATION,
 }
 
-OAUTH2_SPEC = OAuth2RotatingTokenSpec(
+OAUTH2_SPEC = OAuth2Spec(
     provider="zendesk",
     accessTokenBody=json.dumps(accessTokenBody),
     authUrlTemplate=(