From dc85bce13d1cffe5c478dee14654abba666813f5 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 19 Sep 2019 10:24:09 +0200
Subject: [PATCH] no-jira: fix OAuth for ADFS 2016 part 2
---
src/main/java/org/olat/login/oauth/spi/ADFSApi.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/login/oauth/spi/ADFSApi.java b/src/main/java/org/olat/login/oauth/spi/ADFSApi.java
index 6bcf60de12e..fb58c3545ee 100644
--- a/src/main/java/org/olat/login/oauth/spi/ADFSApi.java
+++ b/src/main/java/org/olat/login/oauth/spi/ADFSApi.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException;
import org.olat.core.CoreSpringFactory;
import org.olat.core.helpers.Settings;
+import org.olat.core.util.StringHelper;
import org.olat.login.oauth.OAuthLoginModule;
import com.github.scribejava.core.builder.api.DefaultApi20;
@@ -117,7 +118,9 @@ public class ADFSApi extends DefaultApi20 {
throws InterruptedException, ExecutionException, IOException {
OAuthRequest request = new OAuthRequest(Verb.POST, api.getAccessTokenEndpoint());
request.addBodyParameter(OAuthConstants.CLIENT_ID, getApiKey());
- request.addBodyParameter(OAuthConstants.CLIENT_SECRET, getApiSecret());
+ if(StringHelper.containsNonWhitespace(getApiSecret())) {
+ request.addBodyParameter(OAuthConstants.CLIENT_SECRET, getApiSecret());
+ }
request.addBodyParameter(OAuthConstants.CODE, code);
request.addBodyParameter(OAuthConstants.REDIRECT_URI, getCallback());
request.addBodyParameter(GRANT_TYPE, GRANT_TYPE_AUTHORIZATION_CODE);
--
GitLab