User email address change - new proces.

cmsWebApp/src/performa/form/SaveUserDetailsFP.java

@@ -67,12 +67,10 @@ public class SaveUserDetailsFP extends SaveFP
                         {
     //                        companyUser.setIsAccountVerified(Boolean.FALSE);
                             companyUser.setIsEmailChanged(Boolean.TRUE);
-
+                            
                             Utils.sendEmailChangedMail(companyUser, request, emailer, SaveUserDetailsFP.class.getName());
                         }
                     }
-
-//                    secUser.setEmail(secUser.getUserName());
                 }
                 else //email changed for social login
                 {

cmsWebApp/src/performa/form/UserLoginFP.java

 package performa.form;
 
 import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import oneit.logging.LogLevel;
+import oneit.logging.LogMgr;
+import oneit.logging.LoggingArea;
 import oneit.objstore.ObjectTransaction;
 import oneit.security.LoginProcessor;
 import oneit.security.SecUser;
@@ -27,5 +31,31 @@ public class UserLoginFP extends LoginProcessor
         {
             throw new FieldException("You're not an authorised user to access this portal.", SecUser.FIELD_UserName);
         }
+        else
+        {
+            //verify email change
+            
+            HttpServletRequest  request =   submission.getRequest();
+            
+            if(request.getSession().getAttribute("EmailToVerify")!=null && companyUser.getIsEmailChanged()==Boolean.TRUE)
+            {
+                companyUser.setIsEmailChanged(Boolean.FALSE);
+                
+                if(!companyUser.isLoggedViaSocial())
+                {
+                    SecUser   secUser   =  companyUser.getUser();           
+
+                    secUser.setUserName(secUser.getEmail());
+                    
+                    LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING2, "User name changed.", secUser);
+                }
+                
+                LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "User Email verified", companyUser);
+                
+                request.getSession().setAttribute("EmailToVerify", null);
+                request.getSession().setAttribute("EmailVerified", true);
+            }
+            
+        }
     }
 }
\ No newline at end of file

cmsWebApp/src/performa/utils/Utils.java

@@ -463,7 +463,7 @@ public class Utils
                 Map             defaultParams       =   CollectionUtils.mapEntry("link", link).toMap(); 
                 ObjectTransform transform           =   Utils.createCompoundTransform(defaultParams, companyUser);
 
-                Utils.sendMail(emailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser);
+                Utils.sendMail(emailer, transform, new String[]{companyUser.getUser().getEmail()}, null, companyUser);
 
                 LogMgr.log(CompanyUser.LOG, LogLevel.PROCESSING1, "Sent email changed mail successfully from " + callingClass + " to :: ", companyUser);
             }

cmsWebApp/webroot/extensions/adminportal/email_verified.jsp

@@ -16,7 +16,6 @@
     //to process company user verification
     String              id          =   request.getParameter("id");
     String              key         =   request.getParameter("key");
-    Boolean             invalid     =   Boolean.TRUE;   
             
     if(id!=null && key!=null)
     {
@@ -24,38 +23,19 @@
 
         if(companyUser!=null && companyUser.getIsEmailChanged()==Boolean.TRUE)
         {
-            try
-            {
-                companyUser.setIsEmailChanged(Boolean.FALSE);
-                companyUser.setIsAccountVerified(Boolean.TRUE);
-                
-                objTran.commit();
-                objTran.commitResources();
-            }
-            finally
-            {
-                objTran.releaseResources();
-            }
+            session =   request.getSession();
+            session.invalidate();
             
-            invalid =   Boolean.FALSE;
-//            response.sendRedirect(nextPage);
+            session =   request.getSession(true);
+            session.setAttribute("EmailToVerify", true);
+            response.sendRedirect(nextPage);
+            
+            return;
         }
     }
-    
-    if(invalid)
-    {
-%>
-        <h3>Verification Error</h3>
-        <p><span>Access expired.</span></p>
-<%
-    }
-    else
-    {
 %>
-        <p>Your e-mail address is successfully verified! Please login to access your account!</p>
-        <a class="btn btn-primary" href="<%= nextPage %>">Go to login</a>
-<%
-    }
-%>
-
+    
+    <h3>Verification Error</h3>
+    <p><span>Access expired.</span></p>
+    
 <%@ include file="inc/htmlfooter_nopriv.jsp" %>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/messages/messagesOverride.txt

@@ -4,3 +4,4 @@
 #passwordNotMatch       =   The password does not match. Please try again.
 #invitationSent         =   Your invitation has been successfully sent.
 #invalidEmail           =   Invalid email address.
+#emailChanged           =   Your email address is successfully verified!
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/my_details.jsp

@@ -6,13 +6,22 @@
 
 <oneit:dynIncluded>
 <%
-    SecUser     loggedInUser    =   SecUser.getTXUser(transaction);
-    CompanyUser companyUser     =   loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+    ObjectTransaction   objTran         =   process.getTransaction ();
+    SecUser             loggedInUser    =   SecUser.getTXUser(transaction);
+    CompanyUser         companyUser     =   loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
 
     Debug.assertion(companyUser != null , "Invalid user in admin portal my details");
 
-    String      nextPage        =   WebUtils.getSamePageInRenderMode(request, "Page");
-    boolean     emailChanged    =   request.getAttribute("EmailChanged") != null ? (boolean) request.getAttribute("EmailChanged") : false;
+    String              nextPage        =   WebUtils.getSamePageInRenderMode(request, "Page");
+    boolean             emailChanged    =   request.getAttribute("EmailChanged") != null ? (boolean) request.getAttribute("EmailChanged") : false;
+    
+    Boolean             verified        =   request.getSession().getAttribute("EmailVerified")!=null; 
+    
+    if(verified)
+    {
+        request.getSession().setAttribute("EmailVerified", null);
+    }
+
 %>
     <script type="text/javascript">
         $(document).ready(function()
@@ -31,13 +40,13 @@
             });
         });
         
-    </script> 
+    </script>
     
     <oneit:form name="editUser" method="post"    enctype="multipart/form-data">
         <div class="container-fluid">
             <div class="row content">
                 <div class="main-content-area">
-                    <h1 class="page-title">My Details</h1>        
+                    <h1 class="page-title">My Details<%= verified ? "--changed" : "" %></h1>        
                         <div style="padding-left: 15px; padding-right: 15px;">
                             <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
                         </div>

cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp

@@ -14,10 +14,21 @@
     {
         CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
 
-        if(companyUser!=null && companyUser.isLoggedViaSocial() && companyUser.getIsAccountVerified()!=Boolean.TRUE)
+        if(companyUser!=null)
         {
-            response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.COMPANY_ACCOUNT_VERIFICATION).getLink(request));
-            return;
+            if(companyUser.isLoggedViaSocial() && companyUser.getIsAccountVerified()!=Boolean.TRUE)
+            {
+                response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.COMPANY_ACCOUNT_VERIFICATION).getLink(request));
+                return;
+            }
+            
+            //to notify email address changed
+            if(request.getSession().getAttribute("EmailVerified")!=null)
+            {
+                String messageId = NotificationUtils.getNotifyIdIfRequired(process, request);
+                response.sendRedirect(NotificationUtils.appendNotifyIDToURL(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.MY_DETAILS).getLink(request), messageId));
+                return;
+            }
         }
     }
     

cmsWebApp/webroot/extensions/adminportal/sign_in.jsp

@@ -48,6 +48,17 @@
     }
 </style>
 
+<%
+    if(request.getSession().getAttribute("EmailToVerify")!=null)
+    {
+%>
+        <div class="form-group">
+            <p>Please login to verify your email address.</p>
+        </div>
+<%
+    }
+%>
+
 <div class="main-box-layout login-box">
     <oneit:form name="login"    method="post">
         <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>