diff options
| author | Daniel <djr2468@gmail.com> | 2023-04-05 22:29:32 +0100 |
|---|---|---|
| committer | Daniel <djr2468@gmail.com> | 2023-04-05 22:29:32 +0100 |
| commit | 88a56f29fff1ab252a2c415f0d44a22192dd6b66 (patch) | |
| tree | 119d616817ca314057c31df6848ee633fe99b467 /src/main/java/org/traccar/database | |
| parent | c0dd2a6187de517af33aa92e0524414e65d973b4 (diff) | |
| download | trackermap-server-88a56f29fff1ab252a2c415f0d44a22192dd6b66.tar.gz trackermap-server-88a56f29fff1ab252a2c415f0d44a22192dd6b66.tar.bz2 trackermap-server-88a56f29fff1ab252a2c415f0d44a22192dd6b66.zip | |
Implement retrieveWebUrl
Diffstat (limited to 'src/main/java/org/traccar/database')
| -rw-r--r-- | src/main/java/org/traccar/database/OpenIdProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/database/OpenIdProvider.java b/src/main/java/org/traccar/database/OpenIdProvider.java index 6550a1278..d0ec4e98d 100644 --- a/src/main/java/org/traccar/database/OpenIdProvider.java +++ b/src/main/java/org/traccar/database/OpenIdProvider.java @@ -86,9 +86,9 @@ public class OpenIdProvider { clientId = new ClientID(config.getString(Keys.OPENID_CLIENT_ID)); clientAuth = new ClientSecretBasic(clientId, new Secret(config.getString(Keys.OPENID_CLIENT_SECRET))); - callbackUrl = new URI(config.getString(Keys.WEB_URL, "") + "/api/session/openid/callback"); - baseUrl = new URI(config.getString(Keys.WEB_URL, "")); - + baseUrl = new URI(WebHelper.retrieveWebUrl(config)); + callbackUrl = new URI(WebHelper.retrieveWebUrl(config) + "/api/session/openid/callback"); + if (config.hasKey(Keys.OPENID_ISSUER_URL)) { HttpRequest httpRequest = HttpRequest.newBuilder( URI.create(config.getString(Keys.OPENID_ISSUER_URL) + "/.well-known/openid-configuration")) |