Merge pull request #2 from JamaSoftware/oauth_upgrade

Added support for OAuth

Author: nmchale-jama

.DS_Store

@@ -0,0 +1,6 @@
+target/
+*.iml
+import.cfg
+*.csv
+classes/
+*idea/

.gitignore

@@ -42,11 +42,19 @@ Change these options as required (in step 2 above).
 
 ```delimiter = <single character> ``` -- A single character, usually a comma or semicolon.  This character is what separates elements of the CSV file.  It’s also used in the lists in the rest of this file. 
 
+-- CHOOSE 1 Authentication method, fill in the appropriate settings, Leave the other set empty, but do not delete the option entry--
+-- To Use Basic Auth Enter your Username and Password, Leave ClientID and ClientSecret set to the empty string. --
+-- To Enable OAuth Enter your ClientID an ClientSecret, Leave Username and Password set to the empty string.--
+
 ```username = <string> ``` -- Jama username. 
 
 ```password = <string> ``` -- Jama password. 
 
-```baseURL = <string> ``` -- The base URL of the Jama instance. For hosted this is {base url}/rest/latest/ For on-prem it’s {base url}/contour/rest/latest/ 
+```clientID = <string>``` -- Jama Oauth Client ID
+
+```clientSecret = <string>``` -- Jama Oauth Client Secret
+
+```baseURL = <string> ``` -- The base URL of the Jama instance. For hosted this is {base url}/rest/ For on-prem it’s {base url}/contour/rest/
 
 ```csvFile = <string> ``` -- The name of a CSV file in the same directory as the JAR file. 
 

README.md

@@ -41,6 +41,14 @@
                 </configuration>
 
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

RelationshipCreator.iml

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.jamasoftware.relationshipCreator.Main
+

pom.xml

@@ -14,25 +14,30 @@
 public class Config {
 
     private UsernamePasswordCredentials credentials;
+    private String clientID;
+    private String clientSecret;
+
     private String baseURL;
     private String csvFile;
-
     private int columnAItemType;
+
     private String columnAFieldName;
     private int[] columnAProjects;
-
     private int columnBItemType;
+
     private String columnBFieldName;
     private int[] columnBProjects;
-
     private String delimiter;
+
     private int delay;
     private int retries;
     private String parseErrors = "";
     private String[] params = new String[] {
             "delimiter",
             "username",
             "password",
+            "clientID",
+            "clientSecret",
             "baseURL",
             "csvFile",
             "columnAItemTypeAPI-ID",
@@ -45,13 +50,20 @@ public class Config {
             "retries"
     };
     private ArrayList<String> configFile = new ArrayList<String>();
-
     public Config() {
         HashMap<String, String[]> params = getParams();
-        String username = params.get("username")[0];
-        String password = params.get("password")[0];
+        if(params.get("username").length < 1 || !"".equals(params.get("username")[0])){
+            System.out.println("Connecting via basic auth.");
+            String username = params.get("username")[0];
+            String password = params.get("password")[0];
+            credentials = new UsernamePasswordCredentials(username, password);
+        }
+        else if(params.get("clientID") != null){
+            System.out.println("Connecting via OAuth.");
+            clientID = params.get("clientID")[0];
+            clientSecret = params.get("clientSecret")[0];
+        }
 
-        credentials = new UsernamePasswordCredentials(username, password);
 
         baseURL = params.get("baseURL")[0];
         csvFile = params.get("csvFile")[0];
@@ -129,6 +141,22 @@ public String getColumnBFieldName() {
         return columnBFieldName;
     }
 
+    public String getClientID() {
+        return clientID;
+    }
+
+    public void setClientID(String clientID) {
+        this.clientID = clientID;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
     public String getDelimiter() {
         return delimiter;
     }

src/main/META-INF/MANIFEST.MF

@@ -39,12 +39,12 @@ public HashMap<String, ArrayList<Integer>> getMapping(String baseURL,
 
         while (resultCount != 0) {
             ProgressRecord.startBatch();
-            String url = baseURL + "abstractitems?itemType=" +
+            String url = baseURL + "v1/" + "abstractitems?itemType=" +
                     itemTypeId + "&maxResults=" +
                     maxResults + "&project=" +
                     projectId + "&startAt=" +
                     startIndex;
-            Response response = RestClient.get(url,
+            Response response = RestClient.get(config, url,
                     config.getCredentials(),
                     config.getDelay());
             if(response.getStatusCode() >= 400) {

src/main/java/com/jamasoftware/relationshipCreator/Config.java

@@ -36,7 +36,7 @@ public void createRelationships(LinkedList<String[]> csv, int attempts) {
                 payload.append(row[2]);
 			}
 			payload.append("}");
-			Response response = RestClient.post(config.getBaseURL() + "relationships/",
+			Response response = RestClient.post(config, config.getBaseURL() +"v1/"+ "relationships/",
 					payload.toString(),
 					config.getCredentials(),
                     config.getDelay());

src/main/java/com/jamasoftware/relationshipCreator/ItemMapper.java

@@ -42,7 +42,7 @@ public void createRelationships(LinkedList<String[]> csv, int attempts) {
                 payload.append(row[2]);
 			}
 			payload.append("}");
-			Response response = RestClient.post(config.getBaseURL() + "relationships/",
+			Response response = RestClient.post(config, config.getBaseURL() + "v1/" + "relationships/",
 					payload.toString(),
 					config.getCredentials(),
                     config.getDelay());