Merge pull request #31 from brendandburns/auth

Fix up auth a little bit.

Author: mbohlool

examples/src/main/java/io/kubernetes/client/examples/Example.java

@@ -28,19 +28,13 @@
  * Requires kubectl proxy running
  * 
  * Easiest way to run this:
- *   mvn exec:java -Dex.mainClass="io.kubernetes.client.examples.Example"
+ *   mvn exec:java -Dexec.mainClass="io.kubernetes.client.examples.Example"
  * 
  * From inside $REPO_DIR/kubernetes
  */
 public class Example {
     public static void main(String[] args) throws IOException, ApiException{
-        ApiClient client;
-        if (args.length == 0) {
-            client = new ApiClient();
-            client.setBasePath("http://localhost:8001");
-        } else {
-            client = Config.fromConfig(args[0]);
-        }
+        ApiClient client = Config.defaultClient();
         Configuration.setDefaultApiClient(client);
 
         CoreV1Api api = new CoreV1Api();

kubernetes/src/main/java/io/kubernetes/client/ApiClient.java

@@ -162,6 +162,8 @@ public ApiClient() {
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
         authentications.put("BearerToken", new ApiKeyAuth("header", "authorization"));
+        authentications.put("BasicAuth", new HttpBasicAuth());
+
         // Prevent the authentications from being modified.
         authentications = Collections.unmodifiableMap(authentications);
     }

util/src/main/java/io/kubernetes/client/util/Config.java

@@ -128,7 +128,9 @@ public static ApiClient fromConfig(Reader input) {
 
         String token = config.getAccessToken();
         if (token != null) {
-            client.setAccessToken(token);
+            // This is kind of a hack, except not, because I don't think we actually
+            // want to use oauth here.
+            client.setApiKey("Bearer " + token);
         }
 
         String username = config.getUsername();

util/src/main/java/io/kubernetes/client/util/KubeConfig.java

@@ -17,6 +17,7 @@
 import java.io.FileReader;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Map;
 
 import org.yaml.snakeyaml.Yaml;
@@ -154,9 +155,19 @@ public String getAccessToken() {
             Map<String, Object> authProviderMap = (Map<String, Object>) authProvider;
             Map<String, Object> authConfig = (Map<String, Object>) authProviderMap.get("config");
             if (authConfig != null) {
+                Date expiry = (Date) authConfig.get("expiry");
+                if (expiry != null) {
+                    if (expiry.compareTo(new Date()) <= 0) {
+                        // TODO: Generate new token here...
+                        throw new IllegalStateException("Token is expired!");
+                    }
+                }
                 return (String) authConfig.get("access-token");
             }
         }
+        if (currentUser.containsKey("token")) {
+            return (String) currentUser.get("token");
+        }
         return null;
     }