Add API token support

Author: glibas

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.assertthat.plugins</groupId>
     <artifactId>assertthat-bdd-standalone</artifactId>
-    <version>1.9.10</version>
+    <version>1.9.11</version>
     <name>assertthat-bdd-standalone</name>
     <description>AssertThat BDD Jira plugin client standalone</description>
     <url>http://www.assertthat.com</url>

src/main/java/com/assertthat/plugins/standalone/APIUtil.java

@@ -41,7 +41,7 @@ public class APIUtil {
     private String reportUrl;
     private OkHttpClient client;
 
-    public APIUtil(String projectId, String accessKey, String secretKey, String proxyURI, String proxyUsername, String proxyPassword, String jiraServerURL, boolean ignoreCertErrors) {
+    public APIUtil(String projectId, String accessKey, String secretKey, String token, String proxyURI, String proxyUsername, String proxyPassword, String jiraServerURL, boolean ignoreCertErrors) {
         if (jiraServerURL != null) {
             this.featuresUrl = jiraServerURL + "/rest/assertthat/latest/project/" + projectId + "/client/features";
             this.reportUrl = jiraServerURL + "/rest/assertthat/latest/project/" + projectId + "/client/report";
@@ -50,7 +50,8 @@ public APIUtil(String projectId, String accessKey, String secretKey, String prox
             this.reportUrl = "https://bdd.assertthat.app/rest/api/1/project/" + projectId + "/report";
         }
         OkHttpClientBuilder builder = new OkHttpClientBuilder();
-        builder.authenticated(accessKey, secretKey);
+        builder.authenticated(accessKey, secretKey, token);
+
         if (ignoreCertErrors) {
             builder.ignoringCertificate();
         }
@@ -110,7 +111,6 @@ public Long upload(Long runId, String runName, String filePath, String type, Str
         RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM)
                 .addFormDataPart("file", fileToUpload.getName(),
                         RequestBody.create(MediaType.parse("application/json"), fileToUpload))
-                .addFormDataPart("some-field", "some-value")
                 .build();
         HttpUrl.Builder httpBuilder = HttpUrl.parse(this.reportUrl).newBuilder();
         httpBuilder.addQueryParameter("runName", runName);

src/main/java/com/assertthat/plugins/standalone/Arguments.java

@@ -43,13 +43,15 @@ public class Arguments {
     private String jiraServerUrl;
     private String type = "cucumber";
     private String tags;
+    private String token;
     private boolean numbered;
     private boolean ignoreCertErrors;
 
     private boolean cleanupFeatures = true;
 
     Arguments(String accessKey,
               String secretKey,
+              String token,
               String projectId,
               String runName,
               String outputFolder,
@@ -69,12 +71,16 @@ public class Arguments {
               boolean cleanupFeatures) {
         this.accessKey = System.getenv("ASSERTTHAT_ACCESS_KEY");
         this.secretKey = System.getenv("ASSERTTHAT_SECRET_KEY");
+        this.token = System.getenv("ASSERTTHAT_TOKEN");
         if (accessKey != null && !accessKey.trim().isEmpty()) {
             this.accessKey = accessKey;
         }
         if (secretKey != null && !secretKey.trim().isEmpty()) {
             this.secretKey = secretKey;
         }
+        if (token != null && !token.trim().isEmpty()) {
+            this.token = token;
+        }
         this.projectId = projectId;
         if (outputFolder != null && !outputFolder.trim().isEmpty()) {
             this.outputFolder = outputFolder;
@@ -265,4 +271,12 @@ public boolean isCleanupFeatures() {
     public void setCleanupFeatures(boolean cleanupFeatures) {
         this.cleanupFeatures = cleanupFeatures;
     }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 }

src/main/java/com/assertthat/plugins/standalone/ArgumentsFeatures.java

@@ -4,6 +4,7 @@ public class ArgumentsFeatures extends Arguments{
 
     public ArgumentsFeatures(String accessKey,
                      String secretKey,
+                     String token,
                      String projectId,
                      String outputFolder,
                      String proxyURI,
@@ -18,6 +19,7 @@ public ArgumentsFeatures(String accessKey,
                      boolean cleanupFeatures) {
         super(accessKey,
                 secretKey,
+                token,
                 projectId,
                 null,
                 outputFolder,

src/main/java/com/assertthat/plugins/standalone/ArgumentsReport.java

@@ -4,6 +4,7 @@ public class ArgumentsReport extends Arguments{
 
     public ArgumentsReport(String accessKey,
                      String secretKey,
+                     String token,
                      String projectId,
                      String runName,
                      String jsonReportFolder,
@@ -19,6 +20,7 @@ public ArgumentsReport(String accessKey,
 
         super(accessKey,
                 secretKey,
+                token,
                 projectId,
                 runName,
                 null,

src/main/java/com/assertthat/plugins/standalone/Main.java

@@ -34,6 +34,7 @@ public class Main {
     public static void main(String[] args) throws IOException, JSONException {
         String ASSERTTHAT_ACCESS_KEY = System.getenv("ASSERTTHAT_ACCESS_KEY");
         String ASSERTTHAT_SECRET_KEY = System.getenv("ASSERTTHAT_SECRET_KEY");
+        String ASSERTTHAT_TOKEN = System.getenv("ASSERTTHAT_TOKEN");
 
         Options options = new Options();
 
@@ -51,6 +52,13 @@ public static void main(String[] args) throws IOException, JSONException {
         secretKeyOption.setArgName("ASSERTTHAT_SECRET_KEY");
         options.addOption(secretKeyOption);
 
+        Option tokenOption = new Option("token",  true, "API token");
+        if (ASSERTTHAT_TOKEN == null || ASSERTTHAT_TOKEN.trim().isEmpty()) {
+            tokenOption.setRequired(true);
+        }
+        tokenOption.setArgName("ASSERTTHAT_TOKEN");
+        options.addOption(tokenOption);
+
         Option projectIdOption = new Option("projectId",  true, "Jira project id");
         projectIdOption.setRequired(true);
         projectIdOption.setArgName("ID");
@@ -186,6 +194,7 @@ public static void main(String[] args) throws IOException, JSONException {
         Arguments arguments = new Arguments(
                 cmd.getOptionValue("accessKey"),
                 cmd.getOptionValue("secretKey"),
+                cmd.getOptionValue("token"),
                 cmd.getOptionValue("projectId"),
                 cmd.getOptionValue("runName"),
                 cmd.getOptionValue("outputFolder"),
@@ -205,7 +214,7 @@ public static void main(String[] args) throws IOException, JSONException {
                 cleanupFeaturesVal
         );
 
-        APIUtil apiUtil = new APIUtil(arguments.getProjectId(), arguments.getAccessKey(), arguments.getSecretKey(), arguments.getProxyURI(), arguments.getProxyUsername(), arguments.getProxyPassword(), arguments.getJiraServerUrl(), ignoreCertErrorsVal);
+        APIUtil apiUtil = new APIUtil(arguments.getProjectId(), arguments.getAccessKey(), arguments.getSecretKey(), arguments.getToken(), arguments.getProxyURI(), arguments.getProxyUsername(), arguments.getProxyPassword(), arguments.getJiraServerUrl(), ignoreCertErrorsVal);
 
         if (cmd.hasOption("features")) {
             File inZip =

src/main/java/com/assertthat/plugins/standalone/OkHttpClientBuilder.java

@@ -18,8 +18,8 @@ class OkHttpClientBuilder {
 
     private OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
-    OkHttpClientBuilder authenticated(String username, String password) {
-        builder.addInterceptor(new BasicAuthInterceptor(username, password));
+    OkHttpClientBuilder authenticated(String username, String password, String token) {
+        builder.addInterceptor(token != null? new TokenAuthInterceptor(token) : new BasicAuthInterceptor(username, password));
         return this;
     }
 
@@ -94,4 +94,22 @@ public Response intercept(Chain chain) throws IOException {
 
     }
 
+    class TokenAuthInterceptor implements Interceptor {
+
+        private String token;
+
+        TokenAuthInterceptor(String token) {
+            this.token = token;
+        }
+
+        @Override
+        public Response intercept(Chain chain) throws IOException {
+            Request request = chain.request();
+            Request authenticatedRequest = request.newBuilder()
+                    .header("Authorization", "Bearer " + token).build();
+            return chain.proceed(authenticatedRequest);
+        }
+
+    }
+
 }