Skip to content

uppercase enum values in ClientAuthorization #2199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
Merged

uppercase enum values in ClientAuthorization #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...m/predic8/membrane/core/interceptor/oauth2/authorizationservice/AuthorizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import com.predic8.membrane.core.transport.ssl.SSLContext;
import com.predic8.membrane.core.transport.ssl.StaticSSLContext;
import jakarta.mail.internet.ParseException;
import org.apache.commons.codec.binary.Base64;
import org.jose4j.jwt.JwtClaims;
import org.jose4j.jwt.MalformedClaimException;
import org.jose4j.jwt.NumericDate;
Expand All @@ -45,7 +44,6 @@
import javax.annotation.concurrent.GuardedBy;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.List;
import java.util.UUID;

Expand All @@ -56,8 +54,6 @@
import static com.predic8.membrane.core.interceptor.oauth2.OAuth2TokenBody.authorizationCodeBodyBuilder;
import static com.predic8.membrane.core.interceptor.oauth2.OAuth2TokenBody.refreshTokenBodyBuilder;
import static com.predic8.membrane.core.interceptor.oauth2client.rf.JsonUtils.isJson;
import static java.net.URLEncoder.encode;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.codec.binary.Base64.encodeBase64;

public abstract class AuthorizationService {
Expand All @@ -79,7 +75,7 @@ public abstract class AuthorizationService {
private SSLContext sslContext;
private boolean useJWTForClientAuth;
private final LogHelper logHelper = new LogHelper();
private ClientAuthorization clientAuthorization = ClientAuthorization.client_secret_basic;
private ClientAuthorization clientAuthorization = ClientAuthorization.CLIENT_SECRET_BASIC;

protected boolean supportsDynamicRegistration = false;

Expand Down Expand Up @@ -259,7 +255,7 @@ public Request.Builder applyAuth(Request.Builder requestBuilder, OAuth2TokenBody
if (clientSecret == null) {
return requestBuilder.body(body.clientId(getClientId()).build());
}
if (clientAuthorization == ClientAuthorization.client_secret_basic) {
if (clientAuthorization == ClientAuthorization.CLIENT_SECRET_BASIC) {
return requestBuilder.header(AUTHORIZATION, "Basic " + new String(encodeBase64((getClientId() + ":" + clientSecret).getBytes()))).body(body.build());
}
return requestBuilder.body(body.clientId(getClientId()).clientSecret(clientSecret).build());
Expand Down
6 changes: 3 additions & 3 deletions ...om/predic8/membrane/core/interceptor/oauth2/authorizationservice/ClientAuthorization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
* Core 1.0 chapter 9</a>.
*/
public enum ClientAuthorization {
client_secret_basic,
client_secret_post
}
CLIENT_SECRET_BASIC,
CLIENT_SECRET_POST
}
2 changes: 1 addition & 1 deletion core/src/test/java/com/predic8/membrane/core/interceptor/oauth2/client/b2c/B2CMembrane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public Outcome handleRequest(Exchange exc) {
auth.setClientSecret(tc.clientSecret);
auth.setScope("openid profile offline_access");
auth.setSubject("sub");
auth.setClientAuthorization(ClientAuthorization.client_secret_post);
auth.setClientAuthorization(ClientAuthorization.CLIENT_SECRET_POST);
return auth;
}

Expand Down