fix review comments

airbytehq · Nov 2, 2021 · 99878af · 99878af
1 parent 5dceb6b
commit 99878af
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 61 deletions.
diff --git a/airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/source.py b/airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/source.py
@@ -34,10 +34,5 @@ def streams(self, config: Mapping[str, Any]) -> List[Stream]:
 
     @staticmethod
     def get_authenticator(config: Mapping[str, Any]):
-        # backward compatibility
-        if config.get("access_token"):
-            token = config.get("access_token")
-        else:
-            token = config.get("credentials", {}).get("access_token")
-
+        token = config["access_token"]
         return TokenAuthenticator(token=token)
diff --git a/airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/spec.json b/airbyte-integrations/connectors/source-surveymonkey/source_surveymonkey/spec.json
@@ -14,61 +14,18 @@
         "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z?$",
         "examples": ["2021-01-01T00:00:00Z"]
       },
-      "credentials": {
-        "type": "object",
-        "title": "Authentication Type",
-        "description": "Authenticate over oAuth flow or provide token",
-        "oneOf": [
-          {
-            "title": "Authenticate via OAuth",
-            "type": "object",
-            "required": ["access_token", "auth_type"],
-            "properties": {
-              "auth_type": {
-                "type": "string",
-                "const": "OAuth",
-                "enum": ["OAuth"],
-                "default": "OAuth",
-                "order": 0
-              },
-              "access_token": {
-                "title": "Access Token",
-                "description": "",
-                "type": "string",
-                "description": "An access token generated using the above client ID and secret",
-                "airbyte_secret": true
-              }
-            }
-          },
-          {
-            "type": "object",
-            "title": "Token Authentication",
-            "additionalProperties": false,
-            "required": ["access_token", "auth_type"],
-            "properties": {
-              "auth_type": {
-                "type": "string",
-                "const": "Token",
-                "enum": ["Token"],
-                "default": "Token",
-                "order": 0
-              },
-              "access_token": {
-                "title": "Access Token",
-                "type": "string",
-                "airbyte_secret": true,
-                "description": "API Token. See the <a href=\"https://docs.airbyte.io/integrations/sources/surveymonkey\">docs</a> for information on how to generate this key."
-              }
-            }
-          }
-        ]
+      "access_token": {
+        "title": "Access Token",
+        "type": "string",
+        "airbyte_secret": true,
+        "description": "API Token. See the <a href=\"https://docs.airbyte.io/integrations/sources/surveymonkey\">docs</a> for information on how to generate this key."
       }
     }
   },
   "authSpecification": {
     "auth_type": "oauth2.0",
     "oauth2Specification": {
-      "rootObject": ["credentials", 0],
+      "rootObject": [],
       "oauthFlowInitParameters": [],
       "oauthFlowOutputParameters": [["access_token"]]
     }

diff --git a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SurveymonkeyOAuthFlow.java b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SurveymonkeyOAuthFlow.java
@@ -4,9 +4,11 @@
 
 package io.airbyte.oauth.flows;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.config.persistence.ConfigRepository;
+import com.google.common.base.Preconditions;
 import io.airbyte.oauth.BaseOAuthFlow;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -60,4 +62,10 @@ protected Map<String, String> getAccessTokenQueryParameters(String clientId, Str
         .build();
   }
 
+  @Override
+  protected Map<String, Object> extractRefreshToken(final JsonNode data, String accessTokenUrl) throws IOException {
+    Preconditions.checkArgument(data.has("access_token"), "Missing 'access_token' in query params from %s", ACCESS_TOKEN_URL);
+    return Map.of("access_token", data.get("access_token").asText());
+  }
+
 }
diff --git a/...rc/test-integration/java/io.airbyte.oauth.flows/SurveymonkeyOAuthFlowIntegrationTest.java b/...rc/test-integration/java/io.airbyte.oauth.flows/SurveymonkeyOAuthFlowIntegrationTest.java
@@ -70,10 +70,8 @@ public void testFullSurveymonkeyOAuthFlow() throws InterruptedException, ConfigN
     final Map<String, Object> params = flow.completeSourceOAuth(workspaceId, definitionId,
         Map.of("code", serverHandler.getParamValue()), REDIRECT_URL);
     LOGGER.info("Response from completing OAuth Flow is: {}", params.toString());
-    assertTrue(params.containsKey("credentials"));
-    final Map<String, Object> credentials = (Map<String, Object>) params.get("credentials");
-    assertTrue(credentials.containsKey("access_token"));
-    assertTrue(credentials.get("access_token").toString().length() > 0);
+    assertTrue(params.containsKey("access_token"));
+    assertTrue(params.get("access_token").toString().length() > 0);
   }
 
 }
diff --git a/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/SurveymonkeyOAuthFlowTest.java b/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/SurveymonkeyOAuthFlowTest.java
@@ -95,7 +95,7 @@ public void testCompleteSourceOAuth() throws IOException, InterruptedException,
     final Map<String, Object> actualQueryParams =
         surveymonkeyOAuthFlow.completeSourceOAuth(workspaceId, definitionId, queryParams, REDIRECT_URL);
 
-    assertEquals(Jsons.serialize(Map.of("credentials", returnedCredentials)), Jsons.serialize(actualQueryParams));
+    assertEquals(returnedCredentials, actualQueryParams);
   }
 
   @Test
@@ -109,7 +109,7 @@ public void testCompleteDestinationOAuth() throws IOException, ConfigNotFoundExc
     final Map<String, Object> actualQueryParams =
         surveymonkeyOAuthFlow.completeDestinationOAuth(workspaceId, definitionId, queryParams, REDIRECT_URL);
 
-    assertEquals(Jsons.serialize(Map.of("credentials", returnedCredentials)), Jsons.serialize(actualQueryParams));
+    assertEquals(returnedCredentials, actualQueryParams);
   }
 
 }