New approach to standardizing OAuth

* Config declares necessary details for both methods, both implement OAuthAwareConfig declaring URL, scope, authCreds(), and sessionCreds().
* Response POJOs implement IAccessToken to check active status and provide session creds as WebParams. SF returns true for check and falls back to error checking.
* OAuthMethod declared in config to pivot between configs.

# Conflicts:
#	rest-client/src/main/java/com/compassion/commons/rest/client/auth/AccessToken.java

Author: rgraudin

rest-client/src/main/java/com/compassion/commons/rest/client/auth/AccessToken.java

@@ -1,6 +1,6 @@
 package com.compassion.commons.rest.client.auth;
 
-import java.util.concurrent.TimeUnit;
+import java.io.IOException;
 
 import com.compassion.commons.rest.client.WebParam.WebHeader;
 import com.compassion.commons.rest.client.WebParam.WebQueryParam;
@@ -11,38 +11,44 @@
 
 import jakarta.ws.rs.client.ClientBuilder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
-@Getter
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-public class AccessToken {
-	private static final String SCOPE_KEY = "scope", GRANT_TYPE = "grant_type",
-		CLIENT_CREDS = "client_credentials", DEF_ENDPOINT = "/oauth2/token";
+public abstract class AccessToken {
 
-	private String accessToken;
-	private int expiresIn;
-	private String tokenType;
-	
-	@JsonIgnore
-	private long expiresAfter;
+	public static IAccessToken acquire(OAuthMethod method, OAuthAwareConfig config) throws IOException {
+		log.info("Acquiring new access token for {}", config.baseUrl());
+		
+		try (var client = new RestClient(ClientBuilder.newBuilder())) {
+			var ret = client.request(RecursiveTarget.newTarget(config.baseUrl()), config.authCreds())
+				.post(Entity.json(null));
+			
+				if (ret.getStatus() < 200 || ret.getStatus() >= 300) {
+					throw new IOException(
+						String.format("Retrieving access token failed with status code %d and details: %s", ret.getStatus(), ret.readEntity(String.class)));
+				}
+			return ret.readEntity(method.getPojo());
+		}
+	}
 
-	public void setExpiresIn(int expiresIn) {
-		this.expiresIn = expiresIn;
-		this.expiresAfter = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(expiresIn - 5);
-		log.info("Access token valid until {}", String.format("%1$tm/%1$td %1$tI:%1$tM:%1$tS", expiresAfter));
+	public interface IAccessToken {
+		Boolean checkActive();
+		WebParam providedSessionCreds();
 	}
 
-	public static AccessToken acquire(AuthEnvironment env, String scope, WebHeader httpAuth) {
-		log.info("Acquiring new access token for {}", env.getAuthSubdomain());
+	@NoArgsConstructor @AllArgsConstructor @Getter
+	public enum OAuthMethod {
+		SALESFORCE(SFSessionResponse.class),
+		OATMEAL(OatmealSessionResponse.class);
 
-		try (var client = new RestClient(ClientBuilder.newBuilder())) {
-			client.setBase(String.format("https://%s.ci.org", env.getAuthSubdomain()))
-				.addPerpetualParams(httpAuth);
-		
-			return client.request(RecursiveTarget.newTarget(DEF_ENDPOINT), WebQueryParam.of(GRANT_TYPE, CLIENT_CREDS),
-				WebQueryParam.of(SCOPE_KEY, scope))
-					.get(AccessToken.class);
-		}
+		private Class<? extends IAccessToken> pojo;
+	}
+	
+	public interface OAuthAwareConfig {
+		WebParam authCreds();
+		WebParam sessionCreds();
+		String getScope();
+		String baseUrl();
 	}
 }

rest-client/src/main/java/com/compassion/commons/rest/client/auth/OatmealSessionResponse.java

@@ -0,0 +1,42 @@
+package com.compassion.commons.rest.client.auth;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.compassion.commons.rest.client.WebParam;
+import com.compassion.commons.rest.client.WebParam.WebHeader;
+import com.compassion.commons.rest.client.auth.AccessToken.IAccessToken;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.google.common.net.HttpHeaders;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
+
+@Getter @Setter @Log4j2
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class OatmealSessionResponse implements IAccessToken {
+	private String accessToken;
+	private int expiresIn;
+	private String tokenType;
+	@JsonIgnore private long expiresAfter;
+	
+	public void setExpiresIn(int expiresIn) {
+		this.expiresIn = expiresIn;
+		this.expiresAfter = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(expiresIn - 5);
+		log.info("Access token valid until {}", String.format("%1$tm/%1$td %1$tI:%1$tM:%1$tS", expiresAfter));
+	}
+	
+	@Override
+	public Boolean checkActive() {
+		return accessToken != null && System.currentTimeMillis() > getExpiresAfter();
+	}
+
+	@Override
+	public WebParam providedSessionCreds() {
+		return WebHeader.of(HttpHeaders.AUTHORIZATION, "Bearer " + getAccessToken());
+	}
+}

rest-client/src/main/java/com/compassion/commons/rest/client/auth/SFSessionResponse.java

@@ -0,0 +1,35 @@
+package com.compassion.commons.rest.client.auth;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.compassion.commons.rest.client.WebParam;
+import com.compassion.commons.rest.client.WebParam.WebHeader;
+import com.compassion.commons.rest.client.auth.AccessToken.IAccessToken;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.google.common.net.HttpHeaders;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter @Setter @Accessors(chain = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class SFSessionResponse implements IAccessToken {
+	
+	private String accessToken;
+	private String instanceUrl;
+	private String tokenType;
+	private String issuedAt;
+	private String id, signature;
+	
+	@Override
+	public Boolean checkActive() {
+		// Salesforce does not provide expiration details so status is only known when a request fails.
+		return true;
+	}
+	@Override
+	public WebParam providedSessionCreds() {
+		return WebHeader.of(HttpHeaders.AUTHORIZATION, StringUtils.joinWith(" ", getTokenType(), getAccessToken()));
+	}
+}