Merge branch 'master' into apigee-sso-provider
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridClient.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
index 87a84ae..a317d07 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridClient.java
@@ -72,6 +72,8 @@
@NotNull public String clientAppUrl() { return getBaseUrl() + "/" + getOrgId() + "/" + getAppId(); }
+ @NotNull public String managementUrl() { return getBaseUrl() + "/management"; }
+
@NotNull public UsergridAuthMode getAuthMode() { return this.config.authMode; }
public void setAuthMode(@NotNull final UsergridAuthMode authMode) { this.config.authMode = authMode; }
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequestManager.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequestManager.java
index ef771e7..7099d42 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequestManager.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/UsergridRequestManager.java
@@ -60,7 +60,18 @@
@NotNull
private UsergridResponse authenticate(@NotNull final UsergridAuth auth) {
Map<String, String> credentials = auth.credentialsMap();
- UsergridRequest request = new UsergridRequest(UsergridHttpMethod.POST, UsergridRequest.APPLICATION_JSON_MEDIA_TYPE, this.usergridClient.clientAppUrl(), null, credentials, this.usergridClient.authForRequests(), "token");
+ String url = this.usergridClient.clientAppUrl();
+ if ( auth instanceof UsergridUserAuth){
+
+ UsergridUserAuth userAuth = (UsergridUserAuth) auth;
+ if( userAuth.isAdminUser()){
+
+ url = this.usergridClient.managementUrl();
+ }
+
+ }
+
+ UsergridRequest request = new UsergridRequest(UsergridHttpMethod.POST, UsergridRequest.APPLICATION_JSON_MEDIA_TYPE, url, null, credentials, this.usergridClient.authForRequests(), "token");
UsergridResponse response = performRequest(request);
if (!isEmpty(response.getAccessToken()) && !isEmpty(response.getExpires())) {
auth.setAccessToken(response.getAccessToken());
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridAuth.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridAuth.java
index 94b4809..1ed61da 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridAuth.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridAuth.java
@@ -28,6 +28,7 @@
@Nullable private String accessToken = null;
@Nullable private Long expiry = null;
private boolean usingToken = false;
+ private boolean isAdminUser = false;
public UsergridAuth() { }
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridUserAuth.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridUserAuth.java
index e1831c2..7cb42ad 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridUserAuth.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/auth/UsergridUserAuth.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.java.client.auth;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.usergrid.java.client.model.UsergridUser;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
@@ -27,6 +26,7 @@
@NotNull private String username;
@NotNull private String password;
+ private boolean isAdminUser = false;
@NotNull public String getUsername() { return username; }
public void setUsername(@NotNull final String username) { this.username = username; }
@@ -34,6 +34,8 @@
@NotNull private String getPassword() { return password; }
public void setPassword(@NotNull final String password) { this.password = password; }
+ public boolean isAdminUser() { return isAdminUser; }
+
@NotNull
@Override
public HashMap<String, String> credentialsMap() {
@@ -48,9 +50,19 @@
this("","");
}
- public UsergridUserAuth(@JsonProperty("username") @NotNull final String username, @JsonProperty("password") @NotNull final String password) {
+ public UsergridUserAuth(@JsonProperty("username") @NotNull final String username,
+ @JsonProperty("password") @NotNull final String password) {
super();
this.username = username;
this.password = password;
}
+
+ public UsergridUserAuth(@JsonProperty("username") @NotNull final String username,
+ @JsonProperty("password") @NotNull final String password,
+ @JsonProperty("isAdminUser") final boolean isAdminUser) {
+ super();
+ this.username = username;
+ this.password = password;
+ this.isAdminUser = isAdminUser;
+ }
}
diff --git a/sdks/java/src/main/java/org/apache/usergrid/java/client/query/UsergridQuery.java b/sdks/java/src/main/java/org/apache/usergrid/java/client/query/UsergridQuery.java
index dc359c0..f7c8430 100644
--- a/sdks/java/src/main/java/org/apache/usergrid/java/client/query/UsergridQuery.java
+++ b/sdks/java/src/main/java/org/apache/usergrid/java/client/query/UsergridQuery.java
@@ -374,11 +374,6 @@
}
String requirementsString = this.constructRequirementString();
- if (!requirementsString.isEmpty()) {
- requirementsString = SELECT_ALL + SPACE + WHERE + SPACE + requirementsString;
- } else {
- requirementsString = SELECT_ALL + SPACE;
- }
String orderByString = this.constructOrderByString();
if (!orderByString.isEmpty()) {
diff --git a/stack/query-validator/src/main/java/org/apache/usergrid/query/validator/ApiServerRunner.java b/stack/query-validator/src/main/java/org/apache/usergrid/query/validator/ApiServerRunner.java
index 7c4d3e5..ba62f55 100644
--- a/stack/query-validator/src/main/java/org/apache/usergrid/query/validator/ApiServerRunner.java
+++ b/stack/query-validator/src/main/java/org/apache/usergrid/query/validator/ApiServerRunner.java
@@ -51,7 +51,7 @@
public boolean setup() {
client = new UsergridClient(getOrg(), getApp(), getBaseUri());
- UsergridUserAuth usergridUserAuth = new UsergridUserAuth(email, password);
+ UsergridUserAuth usergridUserAuth = new UsergridUserAuth(email, password, true);
client.authenticateUser(usergridUserAuth);
return insertDatas();
