added AuthorizationFilter to segregate

This commit is contained in:
Brian Long 2021-09-03 10:16:00 -04:00
parent 97af0a0698
commit b91321c6f3
4 changed files with 16 additions and 8 deletions

View File

@ -1,10 +1,9 @@
package com.inteligr8.rs;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.HttpHeaders;
public class AccessTokenRequestFilter implements ClientRequestFilter {
public class AccessTokenRequestFilter implements AuthorizationFilter {
private final String token;

View File

@ -0,0 +1,7 @@
package com.inteligr8.rs;
import javax.ws.rs.client.ClientRequestFilter;
public interface AuthorizationFilter extends ClientRequestFilter {
}

View File

@ -4,10 +4,9 @@ import java.io.UnsupportedEncodingException;
import java.util.Base64;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.HttpHeaders;
public class BasicAuthRequestFilter implements ClientRequestFilter {
public class BasicAuthRequestFilter implements AuthorizationFilter {
private final String username;
private final String password;

View File

@ -5,7 +5,6 @@ import java.util.Map;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Form;
@ -13,7 +12,7 @@ import javax.ws.rs.core.HttpHeaders;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
public abstract class OAuthRequestFilter implements ClientRequestFilter {
public abstract class OAuthRequestFilter implements AuthorizationFilter {
private final String tokenUrl;
private final String clientId;
@ -50,8 +49,7 @@ public abstract class OAuthRequestFilter implements ClientRequestFilter {
Form form;
if (this.refreshToken != null) {
form = new Form().param("grant_type", "refresh_token")
.param("refresh_token", this.refreshToken);
form = this.createRefreshForm();
} else {
form = this.createForm();
}
@ -80,6 +78,11 @@ public abstract class OAuthRequestFilter implements ClientRequestFilter {
this.refreshToken = (String)response.get("refresh_token");
}
protected Form createRefreshForm() {
return new Form().param("grant_type", "refresh_token")
.param("refresh_token", this.refreshToken);
}
protected abstract Form createForm();
}