keycloak-uncached

Merge pull request #2727 from abstractj/RHSSO-106-1.9.x RHSSO-106:

4/25/2016 2:46:15 PM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java
index 9c06c5d..5654814 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java
@@ -4,7 +4,7 @@ import org.keycloak.admin.client.resource.ClientResource;
 import org.keycloak.admin.client.resource.RealmResource;
 import org.keycloak.representations.idm.ClientRepresentation;
 
-import java.util.Map;
+import java.util.LinkedHashMap;
 
 import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId;
 
@@ -49,9 +49,17 @@ public class ClientManager {
 
         public void updateAttribute(String attribute, String value) {
             ClientRepresentation app = clientResource.toRepresentation();
+            if (app.getAttributes() == null) {
+                app.setAttributes(new LinkedHashMap<String, String>());
+            }
             app.getAttributes().put(attribute, value);
             clientResource.update(app);
         }
 
+        public void directAccessGrant(Boolean enable) {
+            ClientRepresentation app = clientResource.toRepresentation();
+            app.setDirectAccessGrantsEnabled(enable);
+            clientResource.update(app);
+        }
     }
 }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java
index 59b9486..030f798 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java
@@ -23,4 +23,16 @@ public class RealmManager {
         realmRepresentation.setAccessCodeLifespan(accessCodeLifespan);
         realm.update(realmRepresentation);
     }
+
+    public void verifyEmail(Boolean enabled) {
+        RealmRepresentation rep = realm.toRepresentation();
+        rep.setVerifyEmail(enabled);
+        realm.update(rep);
+    }
+
+    public void passwordPolicy(String passwordPolicy) {
+        RealmRepresentation rep = realm.toRepresentation();
+        rep.setPasswordPolicy(passwordPolicy);
+        realm.update(rep);
+    }
 }
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
index a8a0cbe..21dcc0e 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
@@ -114,6 +114,20 @@ public class UserBuilder {
         return this;
     }
 
+    public UserBuilder totpSecret(String totpSecret) {
+        if (rep.getCredentials() == null) {
+            rep.setCredentials(new LinkedList<CredentialRepresentation>());
+        }
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+        credential.setType(CredentialRepresentation.TOTP);
+        credential.setValue(totpSecret);
+
+        rep.getCredentials().add(credential);
+        rep.setTotp(true);
+        return this;
+    }
+
     public UserRepresentation build() {
         return rep;
     }