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/20 18:06:14 UTC

usergrid git commit: Ensure the admin invited to org email is sent even when external SSO is enabled.

Repository: usergrid
Updated Branches:
  refs/heads/master 04e49da58 -> 48d306f45


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/48d306f4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/48d306f4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/48d306f4

Branch: refs/heads/master
Commit: 48d306f455c945c15a91c3c53637b6920cbb03d3
Parents: 04e49da
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Oct 20 11:05:56 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Thu Oct 20 11:05:56 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/48d306f4/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 35fdd30..c0915e4 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
@@ -1768,9 +1768,7 @@ public class ManagementServiceImpl implements ManagementService {
         invalidateManagementAppAuthCache();
 
         if ( email ) {
-            if(!tokens.isExternalSSOProviderEnabled()) {
-                sendAdminUserInvitedEmail(user, organization);
-            }
+            sendAdminUserInvitedEmail(user, organization);
         }
     }