Merge pull request #478 from SalesforceFoundation/feature/sw-authflow

Merge Authflow to Master
SalesforceFoundation · Jan 29, 2020 · 4e38625 · 4e38625
2 parents 999daa1 + faf0493
commit 4e38625
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/classes/VOL_CTRL_PersonalSiteContactLookup.cls b/src/classes/VOL_CTRL_PersonalSiteContactLookup.cls
@@ -79,7 +79,7 @@ global with sharing class VOL_CTRL_PersonalSiteContactLookup {
 
         list<Contact> listCon = VOL_SharedCode.LookupContact(contact, null);
         if (listCon == null || listCon.size() == 0) {
-            strResult = System.Label.labelContactLookupNotFound;
+            strResult = System.Label.labelContactLookupAmbiguous;
         } else {
             SendEmailToContact(listCon[0]);
         }               
@@ -127,7 +127,7 @@ global with sharing class VOL_CTRL_PersonalSiteContactLookup {
             list<Messaging.SendEmailResult> listSER;
             listSER = Messaging.sendEmail(new Messaging.Email[] { mail }, false);
             if (listSER[0].isSuccess()) {
-                strResult = System.Label.labelContactLookupSuccess;
+                strResult = System.Label.labelContactLookupAmbiguous;
                 Task taskRecord = toTask(mail);
                 access.insertRecords(new List<SObject>{ taskRecord });
 

diff --git a/src/classes/VOL_CTRL_PersonalSiteContactLookup_TEST.cls b/src/classes/VOL_CTRL_PersonalSiteContactLookup_TEST.cls
@@ -123,14 +123,14 @@ private with sharing class VOL_CTRL_PersonalSiteContactLookup_TEST {
         ctrl.contact.Lastname = null;
         ctrl.contact.Email = null;
         system.assertEquals(null, ctrl.LookupContact());
-        system.assertEquals(System.Label.labelContactLookupNotFound, ctrl.strResult);
+        system.assertEquals(System.Label.labelContactLookupAmbiguous, ctrl.strResult);
 
         // test bogus contact
         ctrl.contact.Firstname = 'Not There';
         ctrl.contact.Lastname = 'Not There';
         ctrl.contact.Email = 'NotThere@NotThere.com';
         system.assertEquals(null, ctrl.LookupContact());
-        system.assertEquals(System.Label.labelContactLookupNotFound, ctrl.strResult);
+        system.assertEquals(System.Label.labelContactLookupAmbiguous, ctrl.strResult);
 
         // create a temp contact
         Contact con = new Contact();
@@ -144,7 +144,7 @@ private with sharing class VOL_CTRL_PersonalSiteContactLookup_TEST {
         ctrl.contact.LastName = 'LookupTestLastName';
         ctrl.contact.Email = 'LookupTestEmail@email.com';
         system.assertEquals(null, ctrl.LookupContact());
-        system.assertEquals(System.Label.labelContactLookupSuccess, ctrl.strResult);
+        system.assertEquals(System.Label.labelContactLookupAmbiguous, ctrl.strResult);
 
         // test error email handling
         con.Email = null;
@@ -155,7 +155,7 @@ private with sharing class VOL_CTRL_PersonalSiteContactLookup_TEST {
         }
         update con;
         ctrl.SendEmailToContact(con);
-        system.assertNotEquals(System.Label.labelContactLookupSuccess, ctrl.strResult);
+        system.assertNotEquals(System.Label.labelContactLookupAmbiguous, ctrl.strResult);
     }
 
 }
diff --git a/src/classes/VOL_SharedCode.cls b/src/classes/VOL_SharedCode.cls
@@ -948,6 +948,8 @@ global with sharing class VOL_SharedCode {
         str = Label.labelFindVolunteersCriteria;
         str = Label.labelFindVolunteersHelpAssign;
         str = Label.labelVolunteersWizardNewCampaignTitle;
+        str = Label.labelContactLookupSuccess;
+        str = Label.labelContactLookupNotFound;
     }
 
 }
diff --git a/src/labels/CustomLabels.labels b/src/labels/CustomLabels.labels
@@ -503,6 +503,14 @@ day:      &apos;day&apos;</value>
         <shortDescription>label displayed on PersonalSiteContactInfo if the lookup and email succeed</shortDescription>
         <value>Message sent.  Please check your email for a message that contains a link to your Volunteer information.  Thank you.</value>
     </labels>
+    <labels>
+        <fullName>labelContactLookupAmbiguous</fullName>
+        <categories>PersonalSiteContactInfo</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>label displayed on PersonalSiteContactInfo after lookup is complete</shortDescription>
+        <value>If your contact information was found, we'll send a unique volunteer link to the email we have on file.</value>
+    </labels>    
     <labels>
         <fullName>labelCopySchedule</fullName>
         <categories>NewAndEditVRS</categories>