Merge pull request #589 from patriot1burke/master

app full scope

model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java

@@ -78,6 +78,16 @@ public abstract class ClientAdapter implements ClientModel {
         entity.setPublicClient(flag);
     }
 
+    @Override
+    public boolean isFullScopeAllowed() {
+        return entity.isFullScopeAllowed();
+    }
+
+    @Override
+    public void setFullScopeAllowed(boolean value) {
+        entity.setFullScopeAllowed(value);
+    }
+
     @Override
     public Set<String> getWebOrigins() {
         Set<String> result = new HashSet<String>();
@@ -214,6 +224,7 @@ public abstract class ClientAdapter implements ClientModel {
 
     @Override
     public boolean hasScope(RoleModel role) {
+        if (isFullScopeAllowed()) return true;
         Set<RoleModel> roles = getScopeMappings();
         if (roles.contains(role)) return true;
 

model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java

@@ -38,6 +38,8 @@ public abstract class ClientEntity {
     private int notBefore;
     @Column(name="PUBLIC_CLIENT")
     private boolean publicClient;
+    @Column(name="FULL_SCOPE_ALLOWED")
+    private boolean fullScopeAllowed;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "REALM_ID")
@@ -132,4 +134,12 @@ public abstract class ClientEntity {
     public void setPublicClient(boolean publicClient) {
         this.publicClient = publicClient;
     }
+
+    public boolean isFullScopeAllowed() {
+        return fullScopeAllowed;
+    }
+
+    public void setFullScopeAllowed(boolean fullScopeAllowed) {
+        this.fullScopeAllowed = fullScopeAllowed;
+    }
 }