[USERGRID-333] updating Token to accept grant_type of 'client_credent…

…ials'
buondoi · Feb 13, 2015 · a8ecbc0 · a8ecbc0
1 parent 8fa14be
commit a8ecbc0
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
@@ -45,16 +45,25 @@ public Token( String username, String password){
      */
     public Token(String grantType, String username, String password){
         this.put("grant_type",grantType);
-        this.put("username", username);
-        this.put("password", password);
+        if("client_credentials".equals(grantType)){
+            this.put("client_id", username);
+            this.put("client_secret", password);
+        }else{
+            this.put("username", username);
+            this.put("password", password);
+        }
     }
 
     public String getAccessToken(){
         return (String) this.get("access_token");
     }
 
+    public String getGrantType(){
+        return (String) this.get("grant_type");
+    }
+
     public Long getExpirationDate(){
-        return (Long) this.get("expires_in");
+        return ((Integer)this.get("expires_in")).longValue();
     }
 
     public Long getPasswordChanged(){