Repository: usergrid Updated Branches: refs/heads/master 36e28a870 -> 8e9eff8d9
Add new parameter that can be used in the JSP viewables. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/068263ed Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/068263ed Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/068263ed Branch: refs/heads/master Commit: 068263ed437883edeba1d23a024f62bb6e7b0700 Parents: a6fee78 Author: Michael Russo <russomich...@google.com> Authored: Wed May 24 21:45:04 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Thu Aug 17 09:41:40 2017 -0700 ---------------------------------------------------------------------- stack/config/src/main/resources/usergrid-default.properties | 1 + .../apache/usergrid/rest/management/users/UserResource.java | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/068263ed/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties index d505a96..77b047e 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -786,6 +786,7 @@ usergrid.api.url.base=http://localhost:8080/ROOT # instead, use character class ([.] instead of backslash-period) usergrid.org.config.property.regex=usergrid[.]view[.].* +usergrid.viewable.loginEndpoint=http://localhost:8080 ########################### Usergrid Email Templates ######################## http://git-wip-us.apache.org/repos/asf/usergrid/blob/068263ed/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java index 4cbe9b2..b747aa4 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java @@ -66,6 +66,9 @@ public class UserResource extends AbstractContextResource { String token = null; + String loginEndpoint; + + public UserResource() { } @@ -296,6 +299,7 @@ public class UserResource extends AbstractContextResource { if ( ( password1 != null ) && password1.equals( password2 ) ) { management.setAdminUserPassword( user.getUuid(), password1 ); management.revokeAccessTokenForAdminUser( user.getUuid(), token ); + loginEndpoint = properties.getProperty("usergrid.viewable.loginEndpoint"); return handleViewable( "resetpw_set_success", this, organizationId ); } else { @@ -342,6 +346,9 @@ public class UserResource extends AbstractContextResource { return errorMsg; } + public String getLoginEndpoint() { + return loginEndpoint; + } public String getToken() { return token;
