aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/api
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2023-04-03 14:39:55 -0700
committerGitHub <noreply@github.com>2023-04-03 14:39:55 -0700
commit61ea657e806c8412f23376ecc4f1e31025fc9bfc (patch)
tree1a0626c1db0cf02389f6b55bcd9767f232504130 /src/main/java/org/traccar/api
parent2d92fa2473b2317f01b904a8f1afd83e7884d7c8 (diff)
parentcf992ec194ef8fbcd86ad170bdc68c6075712591 (diff)
downloadtrackermap-server-61ea657e806c8412f23376ecc4f1e31025fc9bfc.tar.gz
trackermap-server-61ea657e806c8412f23376ecc4f1e31025fc9bfc.tar.bz2
trackermap-server-61ea657e806c8412f23376ecc4f1e31025fc9bfc.zip
Merge pull request #5060 from dan-r/oidc-tweaks
Minor tweaks to OpenID Connect integration
Diffstat (limited to 'src/main/java/org/traccar/api')
-rw-r--r--src/main/java/org/traccar/api/security/LoginService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/api/security/LoginService.java b/src/main/java/org/traccar/api/security/LoginService.java
index c7482a2e3..db9ed6cff 100644
--- a/src/main/java/org/traccar/api/security/LoginService.java
+++ b/src/main/java/org/traccar/api/security/LoginService.java
@@ -43,6 +43,7 @@ public class LoginService {
private final String serviceAccountToken;
private final boolean forceLdap;
+ private final boolean forceOpenId;
@Inject
public LoginService(
@@ -53,6 +54,7 @@ public class LoginService {
this.ldapProvider = ldapProvider;
serviceAccountToken = config.getString(Keys.WEB_SERVICE_ACCOUNT_TOKEN);
forceLdap = config.getBoolean(Keys.LDAP_FORCE);
+ forceOpenId = config.getBoolean(Keys.OPENID_FORCE);
}
public User login(String token) throws StorageException, GeneralSecurityException, IOException {
@@ -69,6 +71,10 @@ public class LoginService {
}
public User login(String email, String password) throws StorageException {
+ if (forceOpenId) {
+ return null;
+ }
+
email = email.trim();
User user = storage.getObject(User.class, new Request(
new Columns.All(),