Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Add support for additional data in OAuthGrant (#756)

Damien Kusters41cc12dc617b
diff --git a/model/src/main/java/org/openremote/model/auth/OAuthGrant.java b/model/src/main/java/org/openremote/model/auth/OAuthGrant.java
index 73e9d0521..9862f3a23 100644
--- a/model/src/main/java/org/openremote/model/auth/OAuthGrant.java
+++ b/model/src/main/java/org/openremote/model/auth/OAuthGrant.java
@@ -28,8 +28,7 @@ import org.openremote.model.util.TextUtil;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.io.Serializable;
-import java.util.Collections;
-import java.util.Objects;
+import java.util.*;
import static org.openremote.model.util.TextUtil.requireNonNullAndNonEmpty;
@@ -47,6 +46,7 @@ public abstract class OAuthGrant implements Serializable {
public static final String VALUE_KEY_SCOPE = "scope";
protected String tokenEndpointUri;
protected boolean basicAuthHeader;
+ protected Map<String, List<String>> additionalValueMap = null;
@JsonProperty(VALUE_KEY_GRANT_TYPE)
protected String grantType;
@JsonProperty(VALUE_KEY_CLIENT_ID)
@@ -77,9 +77,17 @@ public abstract class OAuthGrant implements Serializable {
if(!TextUtil.isNullOrEmpty(scope)) {
valueMap.put(VALUE_KEY_SCOPE, Collections.singletonList(scope));
}
+ if(additionalValueMap != null)
+ valueMap.putAll(additionalValueMap);
return valueMap;
}
+ public void addFormParameter(String key, String value) {
+ if(additionalValueMap == null)
+ additionalValueMap = new HashMap<>();
+ additionalValueMap.put(key, Collections.singletonList(value));
+ }
+
public String getTokenEndpointUri() {
return tokenEndpointUri;
}