Merge pull request #54 from common-workflow-language/oauth

Add oauth support

Author: MarkRobbo

src/main/java/org/commonwl/viewer/services/GitHubService.java

@@ -22,6 +22,9 @@
 import org.apache.commons.io.IOUtils;
 import org.commonwl.viewer.domain.GithubDetails;
 import org.eclipse.egit.github.core.*;
+import org.eclipse.egit.github.core.RepositoryContents;
+import org.eclipse.egit.github.core.RepositoryId;
+import org.eclipse.egit.github.core.User;
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.CommitService;
 import org.eclipse.egit.github.core.service.ContentsService;
@@ -53,12 +56,15 @@ public class GitHubService {
     private final Pattern githubDirPattern = Pattern.compile(GITHUB_DIR_REGEX);
 
     @Autowired
-    public GitHubService(@Value("${githubAPI.authentication}") boolean authEnabled,
+    public GitHubService(@Value("${githubAPI.authentication}") String authSetting,
+                         @Value("${githubAPI.oauthToken}") String token,
                          @Value("${githubAPI.username}") String username,
                          @Value("${githubAPI.password}") String password) {
         GitHubClient client = new GitHubClient();
-        if (authEnabled) {
+        if (authSetting.equals("basic")) {
             client.setCredentials(username, password);
+        } else if (authSetting.equals("oauth")) {
+            client.setOAuth2Token(token);
         }
         this.contentsService = new ContentsService(client);
         this.userService = new UserService(client);

src/main/resources/application.properties

@@ -26,10 +26,17 @@ totalFileSizeLimit = 10000000
 #=======================
 
 # Authentication increases rate limit from 50 requests/hr to 5000 requests/hr
-githubAPI.authentication = false
+
+# Should be none/basic/oauth
+githubAPI.authentication = none
+
+# Basic authentication details used if githubAPI.authentication = false
 githubAPI.username = username
 githubAPI.password = password
 
+# Oauth token used if githubAPI.authentication = oauth
+githubAPI.oauthToken = token
+
 #=======================
 # MongoDB settings
 #=======================