saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-05-25 11:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

removing redundant logoutUrl from oauth

Browse Source
This commit is contained in:
Dario Ghunney Ware 2025-04-01 14:45:35 +01:00
parent 3f0e878694
commit c302786453
7 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java
View File

@ -186,7 +186,6 @@ public class OAuth2Configuration {
oauth.getClientSecret(), oauth.getClientSecret(),
oauth.getScopes(), oauth.getScopes(),
UsernameAttribute.valueOf(oauth.getUseAsUsername().toUpperCase()), UsernameAttribute.valueOf(oauth.getUseAsUsername().toUpperCase()),
oauth.getLogoutUrl(),
null, null,
null, null,
null); null);

3
src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
View File

@ -122,7 +122,8 @@ public class OtherWebController {
return Arrays.stream(files) return Arrays.stream(files)
.filter(file -> file.getName().endsWith(".traineddata")) .filter(file -> file.getName().endsWith(".traineddata"))
.map(file -> file.getName().replace(".traineddata", "")) .map(file -> file.getName().replace(".traineddata", ""))
.filter(lang -> !lang.equalsIgnoreCase("osd")).sorted() .filter(lang -> !lang.equalsIgnoreCase("osd"))
.sorted()
.toList(); .toList();
} }

1
src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
View File

@ -230,7 +230,6 @@ public class ApplicationProperties {
private Collection<String> scopes = new ArrayList<>(); private Collection<String> scopes = new ArrayList<>();
private String provider; private String provider;
private Client client = new Client(); private Client client = new Client();
private String logoutUrl;
public void setScopes(String scopes) { public void setScopes(String scopes) {
List<String> scopesList = List<String> scopesList =

1
src/main/java/stirling/software/SPDF/model/provider/GitHubProvider.java
View File

@ -29,7 +29,6 @@ public class GitHubProvider extends Provider {
clientSecret, clientSecret,
scopes, scopes,
useAsUsername != null ? useAsUsername : UsernameAttribute.LOGIN, useAsUsername != null ? useAsUsername : UsernameAttribute.LOGIN,
null,
AUTHORIZATION_URI, AUTHORIZATION_URI,
TOKEN_URI, TOKEN_URI,
USER_INFO_URI); USER_INFO_URI);

1
src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java
View File

@ -30,7 +30,6 @@ public class GoogleProvider extends Provider {
clientSecret, clientSecret,
scopes, scopes,
useAsUsername, useAsUsername,
null,
AUTHORIZATION_URI, AUTHORIZATION_URI,
TOKEN_URI, TOKEN_URI,
USER_INFO_URI); USER_INFO_URI);

1
src/main/java/stirling/software/SPDF/model/provider/KeycloakProvider.java
View File

@ -29,7 +29,6 @@ public class KeycloakProvider extends Provider {
useAsUsername, useAsUsername,
null, null,
null, null,
null,
null); null);
} }

3
src/main/java/stirling/software/SPDF/model/provider/Provider.java
View File

@ -25,7 +25,6 @@ public class Provider {
private String clientSecret; private String clientSecret;
private Collection<String> scopes; private Collection<String> scopes;
private UsernameAttribute useAsUsername; private UsernameAttribute useAsUsername;
private String logoutUrl;
private String authorizationUri; private String authorizationUri;
private String tokenUri; private String tokenUri;
private String userInfoUri; private String userInfoUri;
@ -38,7 +37,6 @@ public class Provider {
String clientSecret, String clientSecret,
Collection<String> scopes, Collection<String> scopes,
UsernameAttribute useAsUsername, UsernameAttribute useAsUsername,
String logoutUrl,
String authorizationUri, String authorizationUri,
String tokenUri, String tokenUri,
String userInfoUri) { String userInfoUri) {
@ -50,7 +48,6 @@ public class Provider {
this.scopes = scopes == null ? new ArrayList<>() : scopes; this.scopes = scopes == null ? new ArrayList<>() : scopes;
this.useAsUsername = this.useAsUsername =
useAsUsername != null ? validateUsernameAttribute(useAsUsername) : EMAIL; useAsUsername != null ? validateUsernameAttribute(useAsUsername) : EMAIL;
this.logoutUrl = logoutUrl;
this.authorizationUri = authorizationUri; this.authorizationUri = authorizationUri;
this.tokenUri = tokenUri; this.tokenUri = tokenUri;
this.userInfoUri = userInfoUri; this.userInfoUri = userInfoUri;