Merge pull request #4 from trocco-io/oauth-support

support OAuth 2.0 authorization

Author: d-hrs

README.md

@@ -10,7 +10,11 @@ TODO: Write short description here and build.gradle file.
 
 ## Configuration
 
-- **json_config**: JSON formatted OAuth 2.0 with JWT app configuration. (string, required)
+- **auth_method**: name of mechanism to authenticate requests(jwt or oauth. default: jwt)
+  - "jwt": JWT Auth. see: https://developer.box.com/guides/authentication/jwt/
+    - **json_config**: JSON formatted OAuth 2.0 with JWT app configuration. (string, required)
+  - "oauth_2_0": OAuth 2.0 Auth. see: https://developer.box.com/guides/authentication/oauth2/
+    - **access_token**: credentials used to represent the authenticated user. (string, required)
 - **folder_id**: target folder id (string, required)
 - **path_prefix**: prefix of target files (string, required)
 

src/main/java/org/embulk/input/box/BoxClient.java

@@ -1,5 +1,6 @@
 package org.embulk.input.box;
 
+import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIRequest;
 import com.box.sdk.BoxAPIResponse;
 import com.box.sdk.BoxConfig;
@@ -19,16 +20,23 @@
 
 public class BoxClient {
   private final Logger logger = LoggerFactory.getLogger(BoxClient.class);
-  private BoxDeveloperEditionAPIConnection client;
+  private BoxAPIConnection client;
   private PluginTask pluginTask;
 
   public BoxClient(PluginTask pluginTask) {
     try {
-      BoxConfig config = BoxConfig.readFrom(new StringReader(pluginTask.getJsonConfig()));
-      logger.info(config.getClientId());
-      client = BoxDeveloperEditionAPIConnection.getAppEnterpriseConnection(config);
+      String authMethod = pluginTask.getAuthMeString();
+      if (authMethod.equals("oauth_2_0")) {
+        client = new BoxAPIConnection(pluginTask.getAccessToken().get());
+        logger.info("OAuth 2.0 authorization.");
+      } else if (authMethod.equals("jwt")) {
+        BoxConfig config = BoxConfig.readFrom(new StringReader(pluginTask.getJsonConfig().get()));
+        client = BoxDeveloperEditionAPIConnection.getAppEnterpriseConnection(config);
+        logger.info("JWT authorization.");
+      } else {
+        throw new ConfigException("auth_method: " + authMethod + " is not allowd");
+      }
       this.pluginTask = pluginTask;
-      logger.info("JWT authorization.");
     } catch (IOException e) {
       logger.error(e.getMessage(), e);
       throw new ConfigException(e);

src/main/java/org/embulk/input/box/PluginTask.java

@@ -6,8 +6,17 @@
 import org.embulk.util.config.Task;
 
 public interface PluginTask extends Task {
+  @Config("auth_method")
+  @ConfigDefault("jwt")
+  String getAuthMeString();
+
   @Config("json_config")
-  String getJsonConfig();
+  @ConfigDefault("null")
+  Optional<String> getJsonConfig();
+
+  @Config("access_token")
+  @ConfigDefault("null")
+  Optional<String> getAccessToken();
 
   @Config("folder_id")
   String getFolderId();