removed structured scopes

Author: jricher

openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java

@@ -53,9 +53,6 @@ public class SystemScope {
 private String icon; // class of the icon to display on the auth page
 private boolean defaultScope = false; // is this a default scope for newly-registered clients?
 private boolean restricted = false; // is this scope restricted to admin-only registration access?
-private boolean structured = false; // is this a default scope for newly-registered clients?
-private String structuredParamDescription;
-private String structuredValue;
 
 /**
  * Make a blank system scope with no value
@@ -162,52 +159,6 @@ public void setRestricted(boolean restricted) {
 this.restricted = restricted;
 }
 
-/**
- * @return the isStructured status
- */
-@Basic
-@Column(name = "structured")
-public boolean isStructured() {
-return structured;
-}
-
-/**
- * @param structured the structured to set
- */
-public void setStructured(boolean structured) {
-this.structured = structured;
-}
-
-@Basic
-@Column(name = "structured_param_description")
-public String getStructuredParamDescription() {
-return structuredParamDescription;
-}
-
-/**
- * @param isStructured the isStructured to set
- */
-public void setStructuredParamDescription(String d) {
-this.structuredParamDescription = d;
-}
-
-
-/**
- * @return the structuredValue
- */
-@Transient // we don't save the value of a system scope separately
-public String getStructuredValue() {
-return structuredValue;
-}
-
-/**
- * @param structuredValue the structuredValue to set
- */
-public void setStructuredValue(String structuredValue) {
-this.structuredValue = structuredValue;
-}
-
-
 /* (non-Javadoc)
  * @see java.lang.Object#hashCode()
  */
@@ -221,13 +172,6 @@ public int hashCode() {
 result = prime * result + ((icon == null) ? 0 : icon.hashCode());
 result = prime * result + ((id == null) ? 0 : id.hashCode());
 result = prime * result + (restricted ? 1231 : 1237);
-result = prime * result + (structured ? 1231 : 1237);
-result = prime
-* result
-+ ((structuredParamDescription == null) ? 0
-: structuredParamDescription.hashCode());
-result = prime * result
-+ ((structuredValue == null) ? 0 : structuredValue.hashCode());
 result = prime * result + ((value == null) ? 0 : value.hashCode());
 return result;
 }
@@ -274,24 +218,6 @@ public boolean equals(Object obj) {
 if (restricted != other.restricted) {
 return false;
 }
-if (structured != other.structured) {
-return false;
-}
-if (structuredParamDescription == null) {
-if (other.structuredParamDescription != null) {
-return false;
-}
-} else if (!structuredParamDescription
-.equals(other.structuredParamDescription)) {
-return false;
-}
-if (structuredValue == null) {
-if (other.structuredValue != null) {
-return false;
-}
-} else if (!structuredValue.equals(other.structuredValue)) {
-return false;
-}
 if (value == null) {
 if (other.value != null) {
 return false;
@@ -309,10 +235,7 @@ public boolean equals(Object obj) {
 public String toString() {
 return "SystemScope [id=" + id + ", value=" + value + ", description="
 + description + ", icon=" + icon + ", defaultScope="
-+ defaultScope + ", restricted=" + restricted + ", structured="
-+ structured + ", structuredParamDescription="
-+ structuredParamDescription + ", structuredValue="
-+ structuredValue + "]";
++ defaultScope + ", restricted=" + restricted + "]";
 }
 
 }

openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java

@@ -96,12 +96,7 @@ public interface SystemScopeService {
 public Set<String> toStrings(Set<SystemScope> scope);
 
 /**
- * Test whether the scopes in both sets are compatible, with special
- * processing for structured scopes. All scopes in "actual" must exist in
- * "expected". If a scope in "expected" is structured and has a value, it
- * must be matched exactly by its corresponding scope in "actual". If a
- * scope in "expected" is structured but has no value, it may be matched by
- * a scope with or without a value in "actual".
+ * Test whether the scopes in both sets are compatible. All scopes in "actual" must exist in "expected".
  */
 public boolean scopesMatch(Set<String> expected, Set<String> actual);
 

openid-connect-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql

@@ -10,7 +10,8 @@ CREATE TABLE IF NOT EXISTS access_token (
 refresh_token_id BIGINT,
 client_id BIGINT,
 auth_holder_id BIGINT,
-approved_site_id BIGINT
+approved_site_id BIGINT,
+UNIQUE(token_value)
 );
 
 CREATE TABLE IF NOT EXISTS access_token_permissions (
@@ -235,8 +236,6 @@ CREATE TABLE IF NOT EXISTS system_scope (
 icon VARCHAR(256),
 restricted BOOLEAN DEFAULT false NOT NULL,
 default_scope BOOLEAN DEFAULT false NOT NULL,
-structured BOOLEAN DEFAULT false NOT NULL,
-structured_param_description VARCHAR(256),
 UNIQUE (scope)
 );
 

openid-connect-server-webapp/src/main/resources/db/hsql/loading_temp_tables.sql

@@ -69,7 +69,5 @@ CREATE TEMPORARY TABLE IF NOT EXISTS system_scope_TEMP (
 description VARCHAR(4096),
 icon VARCHAR(256),
 restricted BOOLEAN,
-default_scope BOOLEAN,
-structured BOOLEAN,
-structured_param_description VARCHAR(256)
+default_scope BOOLEAN
 );

openid-connect-server-webapp/src/main/resources/db/hsql/scopes.sql

@@ -10,23 +10,23 @@ START TRANSACTION;
 -- Insert scope information into the temporary tables.
 -- 
 
-INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES
- ('openid', 'log in using your identity', 'user', false, true, false, null),
- ('profile', 'basic profile information', 'list-alt', false, true, false, null),
- ('email', 'email address', 'envelope', false, true, false, null),
- ('address', 'physical address', 'home', false, true, false, null),
- ('phone', 'telephone number', 'bell', false, true, false, null),
- ('offline_access', 'offline access', 'time', false, false, false, null);
+INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES
+ ('openid', 'log in using your identity', 'user', false, true),
+ ('profile', 'basic profile information', 'list-alt', false, true),
+ ('email', 'email address', 'envelope', false, true),
+ ('address', 'physical address', 'home', false, true),
+ ('phone', 'telephone number', 'bell', false, true),
+ ('offline_access', 'offline access', 'time', false, false);
 
 --
 -- Merge the temporary scopes safely into the database. This is a two-step process to keep scopes from being created on every startup with a persistent store.
 --
 
 MERGE INTO system_scope
-USING (SELECT scope, description, icon, restricted, default_scope, structured, structured_param_description FROM system_scope_TEMP) AS vals(scope, description, icon, restricted, default_scope, structured, structured_param_description)
+USING (SELECT scope, description, icon, restricted, default_scope FROM system_scope_TEMP) AS vals(scope, description, icon, restricted, default_scope)
 ON vals.scope = system_scope.scope
 WHEN NOT MATCHED THEN
- INSERT (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES(vals.scope, vals.description, vals.icon, vals.restricted, vals.default_scope, vals.structured, vals.structured_param_description);
+ INSERT (scope, description, icon, restricted, default_scope) VALUES(vals.scope, vals.description, vals.icon, vals.restricted, vals.default_scope);
 
 COMMIT;
 

openid-connect-server-webapp/src/main/webapp/WEB-INF/authz-config.xml

@@ -52,7 +52,7 @@
 
 <bean id="oauthAccessDeniedHandler" class="org.springframework.security.oauth2.provider.error.OAuth2AccessDeniedHandler" />
 
-<bean id="oauthRequestValidator" class="org.mitre.oauth2.token.StructuredScopeAwareOAuth2RequestValidator" />
+<bean id="oauthRequestValidator" class="org.mitre.oauth2.token.ScopeServiceAwareOAuth2RequestValidator" />
 
 <!-- Error page handler. -->
 <mvc:view-controller path="/error" view-name="error" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/views/approve.jsp

@@ -218,10 +218,6 @@
 </span>
 </c:if>
 
-<c:if test="${ scope.structured }">
-<input name="scopeparam_${ fn:escapeXml(scope.value) }" type="text" value="${ fn:escapeXml(scope.structuredValue) }" placeholder="${ fn:escapeXml(scope.structuredParamDescription) }">
-</c:if>
-
 </label>
 
 </c:forEach>

openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json

@@ -306,9 +306,6 @@
  "icon": "Icon",
  "new": "New Scope",
  "select-icon": "Select an icon",
- "structured": "is a structured scope",
- "structured-help": "Is the scope structured with structured values like <code>base:extension</code>?",
- "structured-param-help": "Human-readable description of the structured parameter",
  "subject-type": "Subject Type",
  "value": "Scope value",
  "value-help": "Single string with no spaces",

openid-connect-server-webapp/src/main/webapp/resources/js/scope.js

@@ -23,10 +23,7 @@ var SystemScopeModel = Backbone.Model.extend({
 icon:null,
 value:null,
 defaultScope:false,
-restricted:false,
-structured:false,
-structuredParamDescription:null,
-structuredValue:null
+restricted:false
 },
 
 urlRoot: 'api/scopes'
@@ -267,8 +264,7 @@ var SystemScopeFormView = Backbone.View.extend({
 events:{
 'click .btn-save':'saveScope',
 'click .btn-cancel': function() {app.navigate('admin/scope', {trigger: true}); },
-'click .btn-icon':'selectIcon',
-'change #isStructured input':'toggleStructuredParamDescription'
+'click .btn-icon':'selectIcon'
 },
 
 load:function(callback) {
@@ -290,14 +286,6 @@ var SystemScopeFormView = Backbone.View.extend({
 
 },
 
-toggleStructuredParamDescription:function(e) {
-if ($('#isStructured input', this.el).is(':checked')) {
-$('#structuredParamDescription', this.el).show();
-} else {
-$('#structuredParamDescription', this.el).hide();
-}
-},
-
 saveScope:function(e) {
  e.preventDefault();
 
@@ -313,9 +301,7 @@ var SystemScopeFormView = Backbone.View.extend({
 description:$('#description textarea').val(),
 icon:$('#iconDisplay input').val(),
 defaultScope:$('#defaultScope input').is(':checked'),
-restricted:$('#restricted input').is(':checked'),
-structured:$('#isStructured input').is(':checked'),
-structuredParamDescription:$('#structuredParamDescription input').val()
+restricted:$('#restricted input').is(':checked')
 });
 
 if (valid) {
@@ -356,7 +342,6 @@ var SystemScopeFormView = Backbone.View.extend({
 $("#iconSelector .modal-body", this.el).append(this.iconTemplate({items:items}));
 }, this);
 
-this.toggleStructuredParamDescription();
  $(this.el).i18n();
 return this;
 }

openid-connect-server-webapp/src/main/webapp/resources/template/scope.html

@@ -155,19 +155,6 @@ <h3 id="iconSelectorLabel" data-i18n="scope.system-scope-form.select-icon">Selec
 </div>
 </div>
 
-<div class="control-group">
-<div class="controls" id="isStructured">
-<label class="checkbox">
-<input type="checkbox" <%-structured ? 'checked' : '' %>> <span data-i18n="scope.system-scope-form.structured">is a structured scope</span>
-</label>
-<p class="help-block" data-i18n="[html]scope.system-scope-form.structured-help">Is the scope structured with structured values like <code>base:extension</code>?</p>
-</div>
-<div class="controls" id="structuredParamDescription">
-<input type="text" value="<%-structuredParamDescription ? structuredParamDescription : '' %>">
-<p class="help-block" data-i18n="scope.system-scope-form.structured-param-help">Human-readable description of the structured parameter</p>
-</div>
-</div>
-
  <div class="well well-small">
  <button class="btn btn-small btn-save btn-success"><i class="icon-ok-circle icon-white"></i> <span data-i18n="common.save">Save</span></button> &nbsp; 
  <button class="btn btn-small btn-cancel"><i class="icon-ban-circle"></i> <span data-i18n="common.cancel">Cancel</span></button>