Merge pull request #4 from appirio-tech/dev

sachin-maheshwari · web-flow · commit b8cd3f425227 · 2020-01-09T12:05:09.000+05:30
SSO intermittent login issue #3
diff --git a/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java b/src/main/java/com/appirio/tech/core/service/identity/dao/UserDAO.java
@@ -405,6 +405,9 @@ public TCID register(User user) {
                 createSocialUser(userId, user.getProfile());
             }
             if(providerType!=null && providerType.isEnterprise && providerType!=ProviderType.LDAP) {
+                //  Handle SSO intermittent login issue #3
+                if (user.getProfile()!= null && user.getProfile().getEmail() == null)
+                    user.getProfile().setEmail(user.getEmail());
                 createSSOUserDAO().createSSOUser(userId, user.getProfile());
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,9 @@ public TCID register(User user) {`
`405`	`405`	`createSocialUser(userId, user.getProfile());`
`406`	`406`	`}`
`407`	`407`	`if(providerType!=null && providerType.isEnterprise && providerType!=ProviderType.LDAP) {`
	`408`	`+ // Handle SSO intermittent login issue #3`
	`409`	`+ if (user.getProfile()!= null && user.getProfile().getEmail() == null)`
	`410`	`+ user.getProfile().setEmail(user.getEmail());`
`408`	`411`	`createSSOUserDAO().createSSOUser(userId, user.getProfile());`
`409`	`412`	`}`
`410`	`413`	`}`