add OAuth 2.0 for microsoft_teams source connector

airbyte-oauth/src/main/java/io/airbyte/oauth/BaseOAuth2Flow.java

@@ -143,6 +143,7 @@ public Map<String, Object> completeSourceOAuth(final UUID workspaceId,
             getClientSecretUnsafe(oAuthParamConfig),
             extractCodeParameter(queryParams),
             redirectUrl,
+            Jsons.emptyObject(),
             oAuthParamConfig),
         getDefaultOAuthOutputPath());
   }
@@ -162,6 +163,7 @@ public Map<String, Object> completeDestinationOAuth(final UUID workspaceId,
             getClientSecretUnsafe(oAuthParamConfig),
             extractCodeParameter(queryParams),
             redirectUrl,
+            Jsons.emptyObject(),
             oAuthParamConfig),
         getDefaultOAuthOutputPath());
   }
@@ -183,6 +185,7 @@ public Map<String, Object> completeSourceOAuth(final UUID workspaceId,
             getClientSecretUnsafe(oAuthParamConfig),
             extractCodeParameter(queryParams),
             redirectUrl,
+            inputOAuthConfiguration,
             oAuthParamConfig),
         oAuthConfigSpecification);
   }
@@ -204,6 +207,7 @@ public Map<String, Object> completeDestinationOAuth(final UUID workspaceId,
             getClientSecretUnsafe(oAuthParamConfig),
             extractCodeParameter(queryParams),
             redirectUrl,
+            inputOAuthConfiguration,
             oAuthParamConfig),
         oAuthConfigSpecification);
   }
@@ -212,9 +216,10 @@ protected Map<String, Object> completeOAuthFlow(final String clientId,
                                                   final String clientSecret,
                                                   final String authCode,
                                                   final String redirectUrl,
+                                                  final JsonNode inputOAuthConfiguration,
                                                   final JsonNode oAuthParamConfig)
       throws IOException {
-    final var accessTokenUrl = getAccessTokenUrl();
+    final var accessTokenUrl = getAccessTokenUrl(inputOAuthConfiguration);
     final HttpRequest request = HttpRequest.newBuilder()
         .POST(HttpRequest.BodyPublishers
             .ofString(tokenReqContentType.converter.apply(getAccessTokenQueryParameters(clientId, clientSecret, authCode, redirectUrl))))
@@ -263,7 +268,7 @@ protected String extractCodeParameter(final Map<String, Object> queryParams) thr
   /**
    * Returns the URL where to retrieve the access token from.
    */
-  protected abstract String getAccessTokenUrl();
+  protected abstract String getAccessTokenUrl(final JsonNode inputOAuthConfiguration);
 
   /**
    * Extract all OAuth outputs from distant API response and store them in a flat map.

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/AsanaOAuthFlow.java

@@ -53,7 +53,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/DriftOAuthFlow.java

@@ -62,7 +62,7 @@ protected String extractCodeParameter(Map<String, Object> queryParams) throws IO
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/GithubOAuthFlow.java

@@ -60,7 +60,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HarvestOAuthFlow.java

@@ -76,7 +76,7 @@ protected Map<String, String> getAccessTokenQueryParameters(final String clientI
    *
    */
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java

@@ -84,7 +84,7 @@ private String getScopes() {
    *
    */
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return "https://api.hubapi.com/oauth/v1/token";
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/IntercomOAuthFlow.java

@@ -51,7 +51,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/LinkedinAdsOAuthFlow.java

@@ -52,7 +52,7 @@ protected String formatConsentUrl(UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/MicrosoftTeamsOAuthFlow.java

@@ -22,7 +22,6 @@
 public class MicrosoftTeamsOAuthFlow extends BaseOAuth2Flow {
 
   private static final String fieldName = "tenant_id";
-  private static String tenantId;
 
   public MicrosoftTeamsOAuthFlow(final ConfigRepository configRepository, final HttpClient httpClient) {
     super(configRepository, httpClient);
@@ -48,6 +47,7 @@ protected String formatConsentUrl(final UUID definitionId,
                                     final JsonNode inputOAuthConfiguration)
       throws IOException {
 
+    String tenantId;
     try {
       tenantId = getConfigValueUnsafe(inputOAuthConfiguration, fieldName);
     } catch (final IllegalArgumentException e) {
@@ -129,46 +129,13 @@ public Map<String, Object> completeDestinationOAuth(final UUID workspaceId,
     throw new IOException("not supported");
   }
 
-  @Override
-  public Map<String, Object> completeSourceOAuth(final UUID workspaceId,
-                                                 final UUID sourceDefinitionId,
-                                                 final Map<String, Object> queryParams,
-                                                 final String redirectUrl,
-                                                 final JsonNode inputOAuthConfiguration,
-                                                 final OAuthConfigSpecification oAuthConfigSpecification)
-      throws IOException, ConfigNotFoundException, JsonValidationException {
-    tenantId = null;
-    try {
-      tenantId = getConfigValueUnsafe(inputOAuthConfiguration, fieldName);
-    } catch (final IllegalArgumentException e) {}
-    return super.completeSourceOAuth(workspaceId, sourceDefinitionId, queryParams, redirectUrl, inputOAuthConfiguration, oAuthConfigSpecification);
-  }
-
-  @Override
-  public Map<String, Object> completeDestinationOAuth(final UUID workspaceId,
-                                                      final UUID destinationDefinitionId,
-                                                      final Map<String, Object> queryParams,
-                                                      final String redirectUrl,
-                                                      final JsonNode inputOAuthConfiguration,
-                                                      final OAuthConfigSpecification oAuthConfigSpecification)
-      throws IOException, ConfigNotFoundException, JsonValidationException {
-    tenantId = null;
-    try {
-      tenantId = getConfigValueUnsafe(inputOAuthConfiguration, fieldName);
-    } catch (final IllegalArgumentException e) {}
-    return super.completeDestinationOAuth(workspaceId, destinationDefinitionId, queryParams, redirectUrl, inputOAuthConfiguration,
-        oAuthConfigSpecification);
-  }
-
   /**
    * Returns the URL where to retrieve the access token from.
    *
    */
   @Override
-  protected String getAccessTokenUrl() {
-    if (tenantId == null) {
-      throw new IllegalArgumentException(String.format("Undefined parameter '%s' necessary for the OAuth Flow.", fieldName));
-    }
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
+    String tenantId = getConfigValueUnsafe(inputOAuthConfiguration, fieldName);
     return "https://login.microsoftonline.com/" + tenantId + "/oauth2/v2.0/token";
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/PipeDriveOAuthFlow.java

@@ -64,7 +64,7 @@ protected Map<String, String> getAccessTokenQueryParameters(final String clientI
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/QuickbooksOAuthFlow.java

@@ -76,7 +76,7 @@ protected Map<String, String> getAccessTokenQueryParameters(final String clientI
    * Returns the URL where to retrieve the access token from.
    */
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/RetentlyOAuthFlow.java

@@ -76,7 +76,7 @@ protected Map<String, String> getAccessTokenQueryParameters(final String clientI
    *
    */
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SalesforceOAuthFlow.java

@@ -57,7 +57,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SlackOAuthFlow.java

@@ -56,7 +56,7 @@ protected String formatConsentUrl(final UUID definitionId,
    * Returns the URL where to retrieve the access token from.
    */
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return SLACK_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SnapchatMarketingOAuthFlow.java

@@ -56,7 +56,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SurveymonkeyOAuthFlow.java

@@ -55,7 +55,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/facebook/FacebookOAuthFlow.java

@@ -59,7 +59,7 @@ protected String formatConsentUrl(final UUID definitionId,
   }
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }
 
@@ -76,6 +76,7 @@ protected Map<String, Object> completeOAuthFlow(final String clientId,
                                                   final String clientSecret,
                                                   final String authCode,
                                                   final String redirectUrl,
+                                                  final JsonNode inputOAuthConfiguration,
                                                   final JsonNode oAuthParamConfig)
       throws IOException {
     // Access tokens generated via web login are short-lived tokens
@@ -84,7 +85,7 @@ protected Map<String, Object> completeOAuthFlow(final String clientId,
     // https://developers.facebook.com/docs/instagram-basic-display-api/overview#short-lived-access-tokens
     // Long-Term Tokens section)
 
-    final Map<String, Object> data = super.completeOAuthFlow(clientId, clientSecret, authCode, redirectUrl, oAuthParamConfig);
+    final Map<String, Object> data = super.completeOAuthFlow(clientId, clientSecret, authCode, redirectUrl, inputOAuthConfiguration, oAuthParamConfig);
     Preconditions.checkArgument(data.containsKey("access_token"));
     final String shortLivedAccessToken = (String) data.get("access_token");
     final String longLivedAccessToken = getLongLivedAccessToken(clientId, clientSecret, shortLivedAccessToken);

airbyte-oauth/src/main/java/io/airbyte/oauth/flows/google/GoogleOAuthFlow.java

@@ -67,7 +67,7 @@ protected String formatConsentUrl(final UUID definitionId,
   protected abstract String getScope();
 
   @Override
-  protected String getAccessTokenUrl() {
+  protected String getAccessTokenUrl(final JsonNode inputOAuthConfiguration) {
     return ACCESS_TOKEN_URL;
   }