You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/08/01 16:53:44 UTC
[09/50] [abbrv] usergrid git commit: adding a check to ensure
activationConfirmation emails are not sent for external sos provider enabled
requests.
adding a check to ensure activationConfirmation emails are not sent for external sos provider enabled requests.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2c59bd8e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2c59bd8e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2c59bd8e
Branch: refs/heads/master
Commit: 2c59bd8ee5c4313142a929e2f8301b83c00f3a1b
Parents: 66ca27c
Author: Ayesha Dastagiri <ay...@gmail.com>
Authored: Thu Jul 7 17:52:46 2016 -0700
Committer: Ayesha Dastagiri <ay...@gmail.com>
Committed: Thu Jul 7 17:52:46 2016 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/rest/management/users/UserResource.java | 3 ++-
.../usergrid/management/cassandra/ManagementServiceImpl.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2c59bd8e/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 1c5bcdf..89725b8 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
@@ -199,7 +199,8 @@ public class UserResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "get admin user" );
- String token = management.getAccessTokenForAdminUser( user.getUuid(), ttl );
+// commenting out creation of token each time and setting the token value to the one sent in the request.
+// String token = management.getAccessTokenForAdminUser( user.getUuid(), ttl );
Map<String, Object> userOrganizationData = management.getAdminUserOrganizationData( user, !shallow );
userOrganizationData.put( "token", token );
response.setData( userOrganizationData );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2c59bd8e/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index b062f84..9637dff 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -904,10 +904,13 @@ public class ManagementServiceImpl implements ManagementService {
user.getEmail(), user.getConfirmed(), user.getActivated(), user.getDisabled(),
user.getDynamicProperties(), true );
+
// special case for sysadmin and test account only
if ( !user.getEmail().equals( properties.getProperty( PROPERTIES_SYSADMIN_LOGIN_EMAIL ) )
&& !user.getEmail().equals( properties .getProperty( PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL ) ) ) {
- this.startAdminUserActivationFlow( organizationId, userInfo );
+ if(!tokens.isExternalSSOProviderEnabled()) {
+ this.startAdminUserActivationFlow(organizationId, userInfo);
+ }
}
return userInfo;