Skip to content
Snippets Groups Projects
Commit dc85bce1 authored by srosse's avatar srosse
Browse files

no-jira: fix OAuth for ADFS 2016 part 2

parent 2305667a
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException; ...@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.helpers.Settings; import org.olat.core.helpers.Settings;
import org.olat.core.util.StringHelper;
import org.olat.login.oauth.OAuthLoginModule; import org.olat.login.oauth.OAuthLoginModule;
import com.github.scribejava.core.builder.api.DefaultApi20; import com.github.scribejava.core.builder.api.DefaultApi20;
...@@ -117,7 +118,9 @@ public class ADFSApi extends DefaultApi20 { ...@@ -117,7 +118,9 @@ public class ADFSApi extends DefaultApi20 {
throws InterruptedException, ExecutionException, IOException { throws InterruptedException, ExecutionException, IOException {
OAuthRequest request = new OAuthRequest(Verb.POST, api.getAccessTokenEndpoint()); OAuthRequest request = new OAuthRequest(Verb.POST, api.getAccessTokenEndpoint());
request.addBodyParameter(OAuthConstants.CLIENT_ID, getApiKey()); 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.CODE, code);
request.addBodyParameter(OAuthConstants.REDIRECT_URI, getCallback()); request.addBodyParameter(OAuthConstants.REDIRECT_URI, getCallback());
request.addBodyParameter(GRANT_TYPE, GRANT_TYPE_AUTHORIZATION_CODE); request.addBodyParameter(GRANT_TYPE, GRANT_TYPE_AUTHORIZATION_CODE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment