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/10/28 19:39:44 UTC
[2/5] usergrid git commit: Ensure the admin invited to org email is
sent even when external SSO is enabled.
Ensure the admin invited to org email is sent even when external SSO is enabled.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/73de9030
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/73de9030
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/73de9030
Branch: refs/heads/hotfix-20160819
Commit: 73de90309fe1593ec06e8b75095321af4c564f0c
Parents: 8921850
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Oct 20 11:05:56 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Fri Oct 28 12:20:45 2016 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceImpl.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/73de9030/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 03377a3..876cd5b 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
@@ -1739,9 +1739,7 @@ public class ManagementServiceImpl implements ManagementService {
invalidateManagementAppAuthCache();
if ( email ) {
- if(!tokens.isExternalSSOProviderEnabled()) {
- sendAdminUserInvitedEmail(user, organization);
- }
+ sendAdminUserInvitedEmail(user, organization);
}
}