fix intercom messenger issue

cmsWebApp/src/performa/form/SaveUserDetailsFP.java

@@ -48,7 +48,7 @@ public class SaveUserDetailsFP extends SaveFP
                 {
                     if(companyUser.getConfirmPassword() == null)
                     {
-                        submission.getRequest().setAttribute("EmailChanged", true);
+                        request.setAttribute("EmailChanged", true);
                         return RedisplayResult.getInstance();
                     }
                     else
@@ -57,7 +57,7 @@ public class SaveUserDetailsFP extends SaveFP
 
                         if(!validPassword)
                         {
-                            submission.getRequest().setAttribute("EmailChanged", false);
+                            request.setAttribute("EmailChanged", false);
                             companyUser.setConfirmPassword(null);
                         }
 
@@ -83,13 +83,17 @@ public class SaveUserDetailsFP extends SaveFP
                 }
             }
             
-            User    intercomUser    =   IntercomUtils.updateIntercomUser(secUser);
+            User    intercomUser    =   (User)request.getSession().getAttribute("IntercomUser");
             
             if(intercomUser == null)
             {
                 performa.intercom.resources.Company intercomCompany =   IntercomUtils.findOrCreateCompany(companyUser.getCompany());
 
-                IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany);
+                IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany, companyUser.getPhone());
+            }
+            else
+            {
+                IntercomUtils.updateIntercomUser(secUser, companyUser.getPhone());
             }
         }
         

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -136,7 +136,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
         
         performa.intercom.resources.Company intercomCompany =   IntercomUtils.findOrCreateCompany(company);
         
-        IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany);
+        IntercomUtils.createIntercomUser(secUser, "Hiring Team", intercomCompany, companyUser.getPhone());
         
         return super.processForm(process, submission, params);
     }

cmsWebApp/src/performa/form/VerifyIdentityFP.java

@@ -30,7 +30,6 @@ public class VerifyIdentityFP extends SaveFP
     protected Map validate(SubmissionDetails submission, MultiException exceptions) 
     {
         HttpServletRequest  request     =   submission.getRequest();
-        Boolean             isVerify    =   CollectionUtils.equals(request.getAttribute("isVerify"), Boolean.TRUE);
         Job                 job         =   (Job) request.getAttribute("Job");
         Candidate           candidate   =   (Candidate) request.getAttribute("Candidate");
         SecUser             secUser     =   candidate.getUser();
@@ -42,16 +41,7 @@ public class VerifyIdentityFP extends SaveFP
         
         BusinessObjectParser.assertFieldCondition(secUser.getFirstName() != null, secUser, SecUser.FIELD_FirstName, "mandatory", exceptions, true, request);
         BusinessObjectParser.assertFieldCondition(secUser.getLastName() != null, secUser, SecUser.FIELD_LastName, "mandatory", exceptions, true, request);
-        
-        
-//        if(isVerify)
-//        {
-//            BusinessObjectParser.assertFieldCondition(job.getPassword()!= null, job, Job.FIELD_Password, "mandatory", exceptions, true, request);
-//            BusinessObjectParser.assertFieldCondition(job.getConfirmPassword()!= null, job, Job.FIELD_ConfirmPassword, "mandatory", exceptions, true, request);
-//            BusinessObjectParser.assertFieldCondition(CollectionUtils.equals(job.getPassword(), job.getConfirmPassword()), job, Job.FIELD_ConfirmPassword, "passwordNotMatch", exceptions, true, request);
-//        
-//        }
-        
+
         return super.validate(submission, exceptions);
     }
 
@@ -79,7 +69,7 @@ public class VerifyIdentityFP extends SaveFP
                 sendMail(candidate, job, request);
                                 
                 // Create a applicant user in intercom
-                IntercomUtils.createIntercomUser(secUser, "Applicant", null);
+                IntercomUtils.createIntercomUser(secUser, "Applicant", null, candidate.getPhone());
                 
                 request.getSession().setAttribute (SecUser.SEC_USER_ID, secUser);
                 request.getSession().setAttribute (SessionSecUserDecorator.REFRESH_SECURITY, Boolean.TRUE);

cmsWebApp/src/performa/intercom/utils/IntercomUtils.java

@@ -2,7 +2,6 @@ package performa.intercom.utils;
 
 import java.util.HashMap;
 import java.util.Map;
-import oneit.appservices.config.ConfigMgr;
 import oneit.logging.LogLevel;
 import oneit.logging.LogMgr;
 import oneit.logging.LoggingArea;
@@ -11,17 +10,19 @@ import performa.intercom.resources.Company;
 import performa.intercom.resources.CustomAttribute;
 import performa.intercom.resources.Intercom;
 import performa.intercom.resources.User;
+import performa.utils.Utils;
 
 
 public class IntercomUtils 
 {
     static
     {
-        Intercom.setToken(ConfigMgr.getKeyfileString("intercom.token", ""));
+        Intercom.setToken(Utils.INTERCOM_TOKEN);
+        Intercom.setAppID(Utils.INTERCOM_APP_ID);
     }
     
     
-    public static User createIntercomUser(SecUser secUser, String role, Company company)
+    public static User createIntercomUser(SecUser secUser, String role, Company company, String phone)
     {
         try
         {
@@ -30,6 +31,7 @@ public class IntercomUtils
             user.setUserId(secUser.getIdentification());
             user.setEmail(secUser.getEmail());
             user.setName(secUser.getName());
+            user.setPhone(phone);
             user.addCustomAttribute(CustomAttribute.newStringAttribute("role", role));    
             
             if(company != null)
@@ -67,7 +69,7 @@ public class IntercomUtils
     }
     
     
-    public static User updateIntercomUser(SecUser secUser)
+    public static User updateIntercomUser(SecUser secUser, String phone)
     {
         try
         {        
@@ -77,6 +79,7 @@ public class IntercomUtils
             {
                 user.setEmail(secUser.getEmail());
                 user.setName(secUser.getName());
+                user.setPhone(phone);
                 User.update(user);
             }
             

cmsWebApp/src/performa/utils/Utils.java

@@ -45,6 +45,8 @@ public class Utils
     public static final String  LEVEL_MANAGEMENT                =   "Management";
     public static final String  LEVEL_EXECUTIVE                 =   "Executive";
     public static final String  HEAP_ANALYSIS_ID                = 	ConfigMgr.getKeyfileString("heap.analysis.id", "3411110378");
+    public static final String  INTERCOM_APP_ID                = 	ConfigMgr.getKeyfileString("intercom.appId", "");
+    public static final String  INTERCOM_TOKEN                = 	ConfigMgr.getKeyfileString("intercom.token", "");
 
     public static Role  getRole(String role, ObjectTransaction transaction)
     {

cmsWebApp/webroot/dynamic_content_core.jsp

@@ -3,6 +3,8 @@
 <%@ include file="inc/dynamic_content_core_top.jsp"  %>
 <%@ include file="/inc/stdimports50.jsp" %>
 <%@ page import="performa.utils.*"%>
+<%@ page import="performa.intercom.utils.*"%>
+<%@ page import="performa.intercom.resources.User"%>
 
 <%
     ORMProcessState     process         =   (ORMProcessState)(ProcessDecorator.getDefaultProcess(request));

cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp

@@ -5,8 +5,15 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge"></meta>
         <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
         <%
-            Company     company     =   clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null
-                                            ? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null;
+            Company     company         =   clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null
+                                                ? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null;
+            User        intercomUser    =   (User)session.getAttribute("IntercomUser");
+
+            if(intercomUser == null)
+            {
+                intercomUser    =   IntercomUtils.findUserByID(clientUser);
+                session.setAttribute("IntercomUser" , intercomUser);
+            }
         %>
         
         <title><%= "Talentology" + (company != null ? " - " + company.getCompanyName() : "")%></title>
@@ -16,7 +23,8 @@
     </head>
     <script>
         window.intercomSettings = {
-          app_id: "kqed9h3r"
+            app_id: "<%= Utils.INTERCOM_APP_ID %>",
+            user_id: "<%= clientUser.getID().toString() %>"
         };
     </script>
     <script>