Make Github.connect() fail if no credentials are setup

mocleiri · mocleiri · commit 0f6499453722 · 2014-09-30T13:58:06.000-04:00
With the previous change if no credentials were defined Github.connect() would
fall back on an anonymous connection.

This commit changes the behaviour back to what it was before so that if there
are no credentials defined in the ~/.github file and no credentials defined
in the environment an IOException is thrown to alert the method caller.

The caller can call Github.connectAnonymously() if that scenario is allowed.

This should handle most cases unless callers are depending on the
FileNotFoundException being specifically thrown instead of an IOException.
diff --git a/src/main/java/org/kohsuke/github/GitHubBuilder.java b/src/main/java/org/kohsuke/github/GitHubBuilder.java
@@ -30,11 +30,11 @@ public GitHubBuilder() {
      * 
      * If no user is specified it means there is no configuration present so check the environment instead.
      * 
-     * the system properties for the login, password or oauth environment variables.
+     * If there is still no user it means there are no credentials defined and throw an IOException.
      * 
      * @return the configured Builder from credentials defined on the system or in the environment.
      * 
-     * @throws IOException
+     * @throws IOException If there are no credentials defined in the ~/.github properties file or the process environment.
      */
     public static GitHubBuilder fromCredentials() throws IOException {
     	
@@ -44,11 +44,25 @@ public static GitHubBuilder fromCredentials() throws IOException {
 			
 			if (builder.user != null)
 	    		return builder;
-	    	else
-	    		return fromEnvironment();
+	    	else {
+	    		
+	    		// this is the case where the ~/.github file exists but has no content.
+	    		
+	    		builder = fromEnvironment();
+	    		
+	    		if (builder.user != null)
+	    			return builder;
+	    		else
+	    			throw new IOException("Failed to resolve credentials from ~/.github or the environment.");
+	    	}
 	    	
 		} catch (FileNotFoundException e) {
-			return fromEnvironment();
+			builder = fromEnvironment();
+			
+			if (builder.user != null)
+				return builder;
+			else
+				throw new IOException("Failed to resolve credentials from ~/.github or the environment.", e);
 		}
     
     }
