remove obsolete ENUMs. Text change in a few msgs. Several constants m…

…ade private
wildfly-security · Jan 13, 2025 · 369046a · 369046a
1 parent 0b8d06f
commit 369046a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticationError.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/AuthenticationError.java
@@ -36,9 +36,7 @@ public enum Reason {
         INVALID_TOKEN,
         STALE_TOKEN,
         NO_AUTHORIZATION_HEADER,
-        NO_QUERY_PARAMETER_ACCESS_TOKEN,
-        NO_SESSION_ID,
-        METHOD_NOT_ALLOWED
+        NO_QUERY_PARAMETER_ACCESS_TOKEN
     }
 
     private Reason reason;

diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/ElytronMessages.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/ElytronMessages.java
@@ -279,11 +279,11 @@ interface ElytronMessages extends BasicLogger {
     @Message(id = 23070, value = "Authentication request format must be one of the following: oauth2, request, request_uri.")
     RuntimeException invalidAuthenticationRequestFormat();
 
-    @Message(id = 23071, value = "%s is not a valid value for %s")
+    @Message(id = 23071, value = "Invalid logout output: %s is not a valid value for %s")
     RuntimeException invalidLogoutPath(String pathValue, String pathName);
 
-    @Message(id = 23072, value = "The end substring of %s: %s can not be identical to %s: %s")
-    RuntimeException invalidLogoutCallbackPath(String callbackPathTitle, String callbacPathkValue,
-                                               String logoutPathTitle, String logoutPathValue);
+    @Message(id = 23072, value = "Invalid %s: %s the value can not be identical to %s: %s")
+    RuntimeException invalidLogoutCallbackPath(String callbackPathTitle, String callbackPathValue,
+                                               String logoutPathTitle, String logoutPathName);
 }
 
diff --git a/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java b/http/oidc/src/main/java/org/wildfly/security/http/oidc/LogoutHandler.java
@@ -38,13 +38,13 @@
  */
 final class LogoutHandler {
 
-    public static final String POST_LOGOUT_REDIRECT_URI_PARAM = "post_logout_redirect_uri";
-    public static final String ID_TOKEN_HINT_PARAM = "id_token_hint";
+    private static final String POST_LOGOUT_REDIRECT_URI_PARAM = "post_logout_redirect_uri";
+    private static final String ID_TOKEN_HINT_PARAM = "id_token_hint";
     private static final String LOGOUT_TOKEN_PARAM = "logout_token";
     private static final String LOGOUT_TOKEN_TYPE = "Logout";
     private static final String CLIENT_ID_SID_SEPARATOR = "-";
-    public static final String SID = "sid";
-    public static final String ISS = "iss";
+    private static final String SID = "sid";
+    private static final String ISS = "iss";
 
     /**
      * A bounded map to store sessions marked for invalidation after receiving logout requests through the back-channel