github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added device code to discovery, moved device endpoints

pull/1161/merge
Justin Richer 2017-03-14 16:47:45 -04:00
parent f915196c2e
commit f54d44cd9d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
View File

@ -26,6 +26,7 @@ import org.mitre.jwt.encryption.service.JWTEncryptionAndDecryptionService;
import org.mitre.jwt.signer.service.JWTSigningAndValidationService;
import org.mitre.oauth2.model.PKCEAlgorithm;
import org.mitre.oauth2.service.SystemScopeService;
import org.mitre.oauth2.web.DeviceEndpoint;
import org.mitre.oauth2.web.IntrospectionEndpoint;
import org.mitre.oauth2.web.RevocationEndpoint;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean;
@ -301,7 +302,7 @@ public class DiscoveryEndpoint {
JWSAlgorithm.ES256, JWSAlgorithm.ES384, JWSAlgorithm.ES512,
JWSAlgorithm.PS256, JWSAlgorithm.PS384, JWSAlgorithm.PS512,
Algorithm.NONE);
ArrayList<String> grantTypes = Lists.newArrayList("authorization_code", "implicit", "urn:ietf:params:oauth:grant-type:jwt-bearer", "client_credentials", "urn:ietf:params:oauth:grant_type:redelegate");
ArrayList<String> grantTypes = Lists.newArrayList("authorization_code", "implicit", "urn:ietf:params:oauth:grant-type:jwt-bearer", "client_credentials", "urn:ietf:params:oauth:grant_type:redelegate", "urn:ietf:params:oauth:grant-type:device_code");
Map<String, Object> m = new HashMap<>();
m.put("issuer", config.getIssuer());
@ -366,7 +367,8 @@ public class DiscoveryEndpoint {
m.put("revocation_endpoint", baseUrl + RevocationEndpoint.URL); // token revocation endpoint
m.put("code_challenge_methods_supported", Lists.newArrayList(PKCEAlgorithm.plain.getName(), PKCEAlgorithm.S256.getName()));
m.put("device_authorization_endpoint", DeviceEndpoint.URL);
model.addAttribute(JsonEntityView.ENTITY, m);

4
openid-connect-server/src/main/java/org/mitre/oauth2/web/DeviceEndpoint.java
View File

@ -73,8 +73,8 @@ import com.google.common.collect.Sets;
@Controller
public class DeviceEndpoint {
public static final String URL = "device";
public static final String USER_URL = "device-user";
public static final String URL = "devicecode";
public static final String USER_URL = "device";
public static final Logger logger = LoggerFactory.getLogger(DeviceEndpoint.class);