Added authorization operations

.gitignore

@@ -4,4 +4,6 @@
 target
 bin
 .metadata
-**/integrationTest.properties
+.idea
+*.iml
+**/integrationTest.properties

src/main/java/com/openshift/client/IAuthorization.java

@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Sean Kavanagh - initial API and implementation
+ ******************************************************************************/
+package com.openshift.client;
+
+/**
+ * Operations to manage and view authorization resources 
+ * 
+ * @link http://openshift.github.io/documentation/rest_api/rest-api-1-6.html#authorization
+ */
+public interface IAuthorization extends IOpenShiftResource {
+
+
+    /**
+     * authorization id
+     *
+     * @return
+     */
+    public String getId();
+
+    /**
+     * authorization note
+     *
+     * @return
+     */
+    public String getNote();
+
+
+    /**
+     * authorization scopes
+     *
+     * @return
+     */
+    public String getScopes();
+
+    /**
+     * authorization token
+     *
+     * @return
+     */
+    public String getToken();
+
+
+    /**
+     * Destroys this authorization
+     *
+     * @throws OpenShiftException
+     */
+    public void destroy() throws OpenShiftException;
+
+    /**
+     * Refresh the authorization but reloading its content from OpenShift.
+     *
+     * @throws OpenShiftException
+     */
+    public void refresh() throws OpenShiftException;
+}

src/main/java/com/openshift/client/IHttpClient.java

@@ -43,6 +43,7 @@ public interface IHttpClient {
 	public static final String MEDIATYPE_APPLICATION_FORMURLENCODED = "application/x-www-form-urlencoded";
 
 	public static final String AUTHORIZATION_BASIC = "Basic";
+	public static final String AUTHORIZATION_BEARER = "Bearer";
 
 	public static final int STATUS_OK = 200;
 	public static final int STATUS_INTERNAL_SERVER_ERROR = 500;

src/main/java/com/openshift/client/IUser.java

@@ -42,6 +42,40 @@ public interface IUser extends IOpenShiftResource {
 
 	public List<IOpenShiftSSHKey> getSSHKeys() throws OpenShiftException;
 
+    /**
+     * Returns current authorization.  Creates new authorization for user if none exists.
+     * Authorization is set by default when token is used to create API connection.
+     * 
+     * @return authorization 
+     * @throws OpenShiftException
+     */
+	public IAuthorization getAuthorization() throws OpenShiftException;
+
+    /**
+     * Creates and returns new authorization set for user 
+     *
+     * @param note 
+     *      A reminder description of what the authorization is for.
+     * @param scopes 
+     *      Scope of the authorization token to determine type of access.
+     * @return authorization
+     * @throws OpenShiftException
+     */
+	public IAuthorization createAuthorization(String note, String scopes) throws OpenShiftException;
+
+    /**
+     * Creates and returns new authorization set for user 
+     * @param note
+     *      A reminder description of what the authorization is for.
+     * @param scopes
+     *      Scope of the authorization token to determine type of access.
+     * @param expiresIn
+     *      The number of seconds before this authorization expires.
+     * @return authorization
+     * @throws OpenShiftException
+     */
+    public IAuthorization createAuthorization(String note, String scopes, int expiresIn) throws OpenShiftException;
+
 	/**
 	 * Deprecated, use {@link #addSSHKey(String, ISSHPublicKey)}
 	 * 

src/main/java/com/openshift/client/OpenShiftConnectionFactory.java

@@ -107,12 +107,16 @@ public IOpenShiftConnection getConnection(final String clientId, final String us
 
 	public IOpenShiftConnection getConnection(final String clientId, final String username, final String password,
 			final String serverUrl, ISSLCertificateCallback sslCallback) throws OpenShiftException {
-		return getConnection(clientId, username, password, null, null, serverUrl, sslCallback);
+		return getConnection(clientId, username, password, null, null, null, serverUrl, sslCallback);
 	}
+    public IOpenShiftConnection getConnection(final String clientId, final String token,
+                                              final String serverUrl, ISSLCertificateCallback sslCallback) throws OpenShiftException {
+        return getConnection(clientId, null, null, null, null, token, serverUrl, sslCallback);
+    }
 
 	public IOpenShiftConnection getConnection(final String clientId, final String username, final String password,
 			final String authKey, final String authIV, final String serverUrl) throws OpenShiftException {
-		return getConnection(clientId, username, password, null, null, serverUrl, null);
+		return getConnection(clientId, username, password, null, null, null, serverUrl, null);
 	}
 
 	/**
@@ -125,6 +129,8 @@ public IOpenShiftConnection getConnection(final String clientId, final String us
 	 *            user's login.
 	 * @param password
 	 *            user's password.
+	 * @param token
+	 *            authorization token.
 	 * @param serverUrl
 	 *            the server url.
 	 * @return a valid connection
@@ -133,7 +139,7 @@ public IOpenShiftConnection getConnection(final String clientId, final String us
 	 * @throws OpenShiftException
 	 */
 	public IOpenShiftConnection getConnection(final String clientId, final String username, final String password,
-		final String authKey, final String authIV, final String serverUrl,
+		final String authKey, final String authIV, final String token, final String serverUrl,
 		final ISSLCertificateCallback sslCertificateCallback) throws OpenShiftException {
 		if (configuration == null) {
 			try {
@@ -144,31 +150,77 @@ public IOpenShiftConnection getConnection(final String clientId, final String us
 		}
 
 		Assert.notNull(clientId);
-		Assert.notNull(username);
-		Assert.notNull(password);
+		if (token == null || token.trim().length() == 0) {
+			Assert.notNull(username);
+			Assert.notNull(password);
+		}
 		Assert.notNull(serverUrl);
 
 		try {
 			IHttpClient httpClient =
 					new UrlConnectionHttpClientBuilder()
-						.setCredentials(username, password, authKey, authIV)
+						.setCredentials(username, password, authKey, authIV, token)
 						.setSSLCertificateCallback(sslCertificateCallback)
 						.setConfigTimeout(configuration.getTimeout())
 						.client();
-			return getConnection(clientId, username, password, serverUrl, httpClient);
+			return getConnection(clientId, username, password, token, serverUrl, httpClient);
 		} catch (IOException e) {
 			throw new OpenShiftException(e, "Failed to establish connection for user ''{0}}''", username);
 		}
 	}
 
-	protected IOpenShiftConnection getConnection(final String clientId, final String username, final String password,
+	protected IOpenShiftConnection getConnection(final String clientId, final String username, final String password, final String token,
 			final String serverUrl, IHttpClient httpClient) throws OpenShiftException, IOException {
 		Assert.notNull(clientId);
 		Assert.notNull(serverUrl);
 		Assert.notNull(httpClient);
 
 		IRestService service = new RestService(serverUrl, clientId, new JsonMediaType(),
 				IHttpClient.MEDIATYPE_APPLICATION_JSON, new OpenShiftJsonDTOFactory(), httpClient);
-		return getConnection(service, username, password);
+		return getConnection(service, username, password, token);
 	}
+
+      /**
+       * Establish a connection with the clientId along with a user's authorization token
+       *
+       * @param clientId
+       *            http client id
+       * @param token
+       *            authorization token.
+       * @param serverUrl
+       *            the server url.
+       * @return a valid connection
+       * @throws FileNotFoundException
+       * @throws IOException
+       * @throws OpenShiftException
+       */
+      public IOpenShiftConnection getAuthTokenConnection(final String clientId,final String token, final String serverUrl) throws OpenShiftException {
+          return getConnection(clientId, null, null,  null, null, token, serverUrl, null);
+       }
+      /**
+       * Establish a connection with the clientId along with a user's authorization
+       * token. Server URL is retrieved from the local configuration file (in
+       * see $USER_HOME/.openshift/express.conf)
+       *
+       * @param clientId
+       *            http client id
+       * @param token
+       *            authorization token.
+       * @return a valid connection
+       * @throws FileNotFoundException
+       * @throws IOException
+       * @throws OpenShiftException
+       */
+      public IOpenShiftConnection getAuthTokenConnection(final String clientId, final String token)
+              throws OpenShiftException {
+          try {
+              configuration = new OpenShiftConfiguration();
+          } catch (IOException e) {
+              throw new OpenShiftException(e, "Failed to load OpenShift configuration file.");
+          }
+          return getConnection(clientId, null, null,  null, null, token, configuration.getLibraServer(), null);
+      }
+
+
+
 }

src/main/java/com/openshift/internal/client/APIResource.java

@@ -23,6 +23,7 @@
 import com.openshift.client.IOpenShiftConnection;
 import com.openshift.client.IQuickstart;
 import com.openshift.client.IUser;
+import com.openshift.client.IAuthorization;
 import com.openshift.client.OpenShiftException;
 import com.openshift.client.cartridge.EmbeddableCartridge;
 import com.openshift.client.cartridge.ICartridge;
@@ -37,6 +38,7 @@
 import com.openshift.internal.client.response.QuickstartDTO;
 import com.openshift.internal.client.response.QuickstartJsonDTOFactory;
 import com.openshift.internal.client.response.UserResourceDTO;
+import com.openshift.internal.client.response.AuthorizationResourceDTO;
 import com.openshift.internal.client.utils.Assert;
 import com.openshift.internal.client.utils.CollectionUtils;
 import com.openshift.internal.client.utils.IOpenShiftJsonConstants;
@@ -53,20 +55,32 @@ public class APIResource extends AbstractOpenShiftResource implements IOpenShift
 
 	private final String login;
 	private final String password;
+	private final String token;
 	private UserResource user;
+	private AuthorizationResource authorization;
 	//TODO: implement switch that allows to turn ssl checks on/off 
 	private boolean doSSLChecks = false;
 	private List<IDomain> domains;
 	private List<IStandaloneCartridge> standaloneCartridges;
 	private List<IEmbeddableCartridge> embeddableCartridges;
 	private Map<String, IQuickstart> quickstartsByName;
 	private final ExecutorService executorService;
-
-	protected APIResource(final String login, final String password, final IRestService service,
+
+    protected APIResource(final String token, final IRestService service,
+                          final Map<String, Link> links) {
+        super(service, links, null);
+        this.login = null;
+        this.password = null;
+        this.token = token;
+        this.executorService = Executors.newFixedThreadPool(10);
+    }
+
+	protected APIResource(final String login, final String password, final String token, final IRestService service,
 			final Map<String, Link> links) {
 		super(service, links, null);
 		this.login = login;
 		this.password = password;
+		this.token = token;
 		this.executorService = Executors.newFixedThreadPool(10);
 	}
 
@@ -115,6 +129,38 @@ public IUser getUser() throws OpenShiftException {
 		}
 		return this.user;
 	}
+
+    public IAuthorization createAuthorization(String note, String scopes) throws OpenShiftException {
+        if (authorization != null) {
+            authorization.destroy();
+        }
+        this.authorization = new AuthorizationResource(this, new AddAuthorizationRequest().execute(
+            new StringParameter(IOpenShiftJsonConstants.PROPERTY_NOTE, note),
+            new StringParameter(IOpenShiftJsonConstants.PROPERTY_SCOPES, scopes)));
+        return this.authorization;
+    }
+
+    public IAuthorization createAuthorization(String note, String scopes, int expiresIn) throws OpenShiftException {
+        if (authorization != null) {
+            authorization.destroy();
+        }
+        this.authorization = new AuthorizationResource(this, new AddAuthorizationRequest().execute(
+            new StringParameter(IOpenShiftJsonConstants.PROPERTY_NOTE, note),
+            new StringParameter(IOpenShiftJsonConstants.PROPERTY_SCOPES, scopes),
+            new StringParameter(IOpenShiftJsonConstants.PROPERTY_EXPIRES_IN, Integer.toString(expiresIn))));
+        return this.authorization;
+    }
+
+    public IAuthorization getAuthorization() throws OpenShiftException {
+        if (authorization == null) {
+            if(token == null) {
+                this.authorization = new AuthorizationResource(this, new AddAuthorizationRequest().execute(new StringParameter(IOpenShiftJsonConstants.PROPERTY_SCOPES, IOpenShiftJsonConstants.PROPERTY_SESSION)));
+            } else {
+                this.authorization = new AuthorizationResource(this, new ShowAuthorizationRequest().execute(token));
+            }
+        }
+        return this.authorization;
+    }
 
 	@Override
 	public List<IDomain> getDomains() throws OpenShiftException {
@@ -346,4 +392,26 @@ protected List<QuickstartDTO> execute() throws OpenShiftException {
 		}
 	}
 
+    private class AddAuthorizationRequest extends ServiceRequest {
+
+        private AddAuthorizationRequest() throws OpenShiftException {
+            super("ADD_AUTHORIZATION");
+        }
+
+        protected AuthorizationResourceDTO execute(Parameter... parameters) throws OpenShiftException {
+            return super.execute(parameters);
+        }
+    }
+    private class ShowAuthorizationRequest extends ServiceRequest {
+
+        private ShowAuthorizationRequest() throws OpenShiftException {
+            super("SHOW_AUTHORIZATION");
+        }
+
+        protected AuthorizationResourceDTO execute(String id) throws OpenShiftException {
+            List<Parameter> urlPathParameter = new Parameters().add("id", id).toList();
+            return (AuthorizationResourceDTO) super.execute(IHttpClient.NO_TIMEOUT, urlPathParameter, Collections.<Parameter>emptyList());
+        }
+    }
+
 }

src/main/java/com/openshift/internal/client/AbstractOpenShiftConnectionFactory.java

@@ -32,14 +32,14 @@
 public abstract class AbstractOpenShiftConnectionFactory {
 
 	@SuppressWarnings("unchecked")
-	protected IOpenShiftConnection getConnection(IRestService service, final String login, final String password) throws IOException, OpenShiftException {
+	protected IOpenShiftConnection getConnection(IRestService service, final String login, final String password, final String token) throws IOException, OpenShiftException {
 		RestResponse response =
 				(RestResponse) service.request(
 						new Link("Get API", "/api", HttpMethod.GET), 
 						IHttpClient.NO_TIMEOUT,
 						Collections.<Parameter> emptyList(), 
 						Collections.<Parameter> emptyList());
-		return new APIResource(login, password, service, (Map<String, Link>) response.getData());
+		return new APIResource(login, password, token, service, (Map<String, Link>) response.getData());
 	}
 
 }