Allow user to login even if the email address has changes and not verified.

cmsWebApp/src/performa/form/SaveUserDetailsFP.java

@@ -6,7 +6,6 @@ import oneit.components.ParticipantInitialisationContext;
 import oneit.email.ConfigurableArticleTemplateEmailer;
 import oneit.logging.LogLevel;
 import oneit.logging.LogMgr;
-import oneit.objstore.ObjectTransaction;
 import oneit.objstore.StorageException;
 import oneit.objstore.parser.BusinessObjectParser;
 import oneit.security.SecUser;
@@ -43,7 +42,9 @@ public class SaveUserDetailsFP extends SaveFP
 
         if(oldSecUser != null)
         {
-            if(!companyUser.isLoggedViaSocial() && !CollectionUtils.equals(oldSecUser.getUserName(), secUser.getUserName()))
+            if( !CollectionUtils.equals(oldSecUser.getEmail(), secUser.getEmail()))
+            {
+                if(!companyUser.isLoggedViaSocial()) //email changed for normal user
                 {
                     if(companyUser.getConfirmPassword() == null)
                     {
@@ -64,16 +65,16 @@ public class SaveUserDetailsFP extends SaveFP
 
                         if(validPassword)
                         {
-                        companyUser.setIsAccountVerified(Boolean.FALSE);
+    //                        companyUser.setIsAccountVerified(Boolean.FALSE);
                             companyUser.setIsEmailChanged(Boolean.TRUE);
 
                             Utils.sendEmailChangedMail(companyUser, request, emailer, SaveUserDetailsFP.class.getName());
                         }
                     }
 
-                secUser.setEmail(secUser.getUserName());
+//                    secUser.setEmail(secUser.getUserName());
                 }
-            else if (companyUser.isLoggedViaSocial() && !CollectionUtils.equals(oldSecUser.getEmail(), secUser.getEmail()))
+                else //email changed for social login
                 {
                     //send email verification mail
                     LogMgr.log(CompanyUser.LOG, LogLevel.PROCESSING1,"Sending email resetted mail", companyUser );
@@ -82,6 +83,7 @@ public class SaveUserDetailsFP extends SaveFP
 
                     Utils.sendEmailChangedMail(companyUser, request, emailer, SaveUserDetailsFP.class.getName());
                 }
+            }
             
             User    intercomUser    =   IntercomUtils.updateIntercomUser(secUser);
             

cmsWebApp/webroot/extensions/adminportal/my_details.jsp

@@ -53,21 +53,9 @@
                                     </div>
                                     <div class="form-group">
                                         <label><oneit:label GUIName="Email Address" /></label>
-                                        <%
-                                            if(companyUser.isLoggedViaSocial())
-                                            {
-                                        %>
                                         <oneit:ormInput obj="<%= loggedInUser %>" type="text" attributeName="Email"  cssClass="form-control" />   
                                         <%  
-                                            }
-                                            else
-                                            {
-                                        %>
-                                                <oneit:ormInput obj="<%= loggedInUser %>" type="text" attributeName="UserName"  cssClass="form-control" />   
-                                        
-                                        <%  }
-
-                                            if(companyUser.getIsAccountVerified()!=Boolean.TRUE || companyUser.getIsEmailChanged()==Boolean.TRUE)
+                                            if(companyUser.getIsEmailChanged()==Boolean.TRUE)
                                             {
                                         %>
                                                 <div class="email-verify">Email address not yet verified.