From c30278645309bff5abe3d9b18cf33f9d20f0007e Mon Sep 17 00:00:00 2001
From: Dario Ghunney Ware <dariogware@gmail.com>
Date: Tue, 1 Apr 2025 14:45:35 +0100
Subject: [PATCH] removing redundant logoutUrl from oauth

---
 .../SPDF/config/security/oauth2/OAuth2Configuration.java       | 1 -
 .../software/SPDF/controller/web/OtherWebController.java       | 3 ++-
 .../stirling/software/SPDF/model/ApplicationProperties.java    | 1 -
 .../stirling/software/SPDF/model/provider/GitHubProvider.java  | 1 -
 .../stirling/software/SPDF/model/provider/GoogleProvider.java  | 1 -
 .../software/SPDF/model/provider/KeycloakProvider.java         | 1 -
 .../java/stirling/software/SPDF/model/provider/Provider.java   | 3 ---
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java b/src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java
index 4fe03c486..c43d8a606 100644
--- a/src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java
+++ b/src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java
@@ -186,7 +186,6 @@ public class OAuth2Configuration {
                         oauth.getClientSecret(),
                         oauth.getScopes(),
                         UsernameAttribute.valueOf(oauth.getUseAsUsername().toUpperCase()),
-                        oauth.getLogoutUrl(),
                         null,
                         null,
                         null);
diff --git a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
index c70560e3f..a4b2cc962 100644
--- a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
@@ -122,7 +122,8 @@ public class OtherWebController {
         return Arrays.stream(files)
                 .filter(file -> file.getName().endsWith(".traineddata"))
                 .map(file -> file.getName().replace(".traineddata", ""))
-                .filter(lang -> !lang.equalsIgnoreCase("osd")).sorted()
+                .filter(lang -> !lang.equalsIgnoreCase("osd"))
+                .sorted()
                 .toList();
     }
 
diff --git a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
index 36f6f82b7..6956a28fc 100644
--- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
+++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
@@ -230,7 +230,6 @@ public class ApplicationProperties {
             private Collection<String> scopes = new ArrayList<>();
             private String provider;
             private Client client = new Client();
-            private String logoutUrl;
 
             public void setScopes(String scopes) {
                 List<String> scopesList =
diff --git a/src/main/java/stirling/software/SPDF/model/provider/GitHubProvider.java b/src/main/java/stirling/software/SPDF/model/provider/GitHubProvider.java
index 8d8aaf80c..7057ec903 100644
--- a/src/main/java/stirling/software/SPDF/model/provider/GitHubProvider.java
+++ b/src/main/java/stirling/software/SPDF/model/provider/GitHubProvider.java
@@ -29,7 +29,6 @@ public class GitHubProvider extends Provider {
                 clientSecret,
                 scopes,
                 useAsUsername != null ? useAsUsername : UsernameAttribute.LOGIN,
-                null,
                 AUTHORIZATION_URI,
                 TOKEN_URI,
                 USER_INFO_URI);
diff --git a/src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java b/src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java
index a8e65c61e..1bb217c9f 100644
--- a/src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java
+++ b/src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java
@@ -30,7 +30,6 @@ public class GoogleProvider extends Provider {
                 clientSecret,
                 scopes,
                 useAsUsername,
-                null,
                 AUTHORIZATION_URI,
                 TOKEN_URI,
                 USER_INFO_URI);
diff --git a/src/main/java/stirling/software/SPDF/model/provider/KeycloakProvider.java b/src/main/java/stirling/software/SPDF/model/provider/KeycloakProvider.java
index bf2725995..c01d27c20 100644
--- a/src/main/java/stirling/software/SPDF/model/provider/KeycloakProvider.java
+++ b/src/main/java/stirling/software/SPDF/model/provider/KeycloakProvider.java
@@ -29,7 +29,6 @@ public class KeycloakProvider extends Provider {
                 useAsUsername,
                 null,
                 null,
-                null,
                 null);
     }
 
diff --git a/src/main/java/stirling/software/SPDF/model/provider/Provider.java b/src/main/java/stirling/software/SPDF/model/provider/Provider.java
index da1d19f32..c15bc34a6 100644
--- a/src/main/java/stirling/software/SPDF/model/provider/Provider.java
+++ b/src/main/java/stirling/software/SPDF/model/provider/Provider.java
@@ -25,7 +25,6 @@ public class Provider {
     private String clientSecret;
     private Collection<String> scopes;
     private UsernameAttribute useAsUsername;
-    private String logoutUrl;
     private String authorizationUri;
     private String tokenUri;
     private String userInfoUri;
@@ -38,7 +37,6 @@ public class Provider {
             String clientSecret,
             Collection<String> scopes,
             UsernameAttribute useAsUsername,
-            String logoutUrl,
             String authorizationUri,
             String tokenUri,
             String userInfoUri) {
@@ -50,7 +48,6 @@ public class Provider {
         this.scopes = scopes == null ? new ArrayList<>() : scopes;
         this.useAsUsername =
                 useAsUsername != null ? validateUsernameAttribute(useAsUsername) : EMAIL;
-        this.logoutUrl = logoutUrl;
         this.authorizationUri = authorizationUri;
         this.tokenUri = tokenUri;
         this.userInfoUri = userInfoUri;