fix: enable correct phoneNumber/emailAddress parsing

Author: codebytere

README.md

@@ -104,9 +104,8 @@ This method will return an empty array (`[]`) if access to Contacts has not been
   * `lastName` String (optional) - The last name of the contact.
   * `nickname` String (optional) - The nickname for the contact.
   * `birthday` String (optional) - The birthday for the contact in `YYYY-MM-DD` format.
-  * `phoneNumbers` Array<String> (optional) - The phone numbers for the contact, as strings in [E.164 format](https://en.wikipedia.org/wiki/E.164): `+14155552671` or `+442071838750`.
-  * `emailAddresses` Array<String> (optional) - The email addresses for the contact, as strings.
-  * `postalAddresses` Array<String> (optional) - The postal addresses for the contact, as strings.
+  * `phoneNumbers` Array\<String\> (optional) - The phone numbers for the contact, as strings in [E.164 format](https://en.wikipedia.org/wiki/E.164): `+14155552671` or `+442071838750`.
+  * `emailAddresses` Array\<String\> (optional) - The email addresses for the contact, as strings.
 
 Returns `Boolean` - whether the contact information was created successfully.
 

contacts.mm

@@ -77,6 +77,49 @@
   return contact;
 }
 
+NSArray* ParsePhoneNumbers(Napi::Array phone_number_data) {
+  NSMutableArray *phone_numbers = [[NSMutableArray alloc] init];
+
+  int data_length = static_cast<int>(phone_number_data.Length());
+  for (int i = 0; i < data_length; i++) {
+    std::string number_str = phone_number_data.Get(i).As<Napi::String>().Utf8Value();
+    NSString *number = [NSString stringWithUTF8String:number_str.c_str()];
+    CNPhoneNumber *phone_number = [CNPhoneNumber phoneNumberWithStringValue:number];
+    CNLabeledValue *labeled_value = [CNLabeledValue labeledValueWithLabel:@"Home" value:phone_number];
+    [phone_numbers addObject:labeled_value];
+  }
+
+  return phone_numbers;
+}
+
+NSArray* ParseEmailAddresses(Napi::Array email_address_data) {
+  NSMutableArray *email_addresses = [[NSMutableArray alloc] init];
+
+  int data_length = static_cast<int>(email_address_data.Length());
+  for (int i = 0; i < data_length; i++) {
+    std::string email_str = email_address_data.Get(i).As<Napi::String>().Utf8Value();
+    NSString *email = [NSString stringWithUTF8String:email_str.c_str()];
+    CNLabeledValue *labeled_value = [CNLabeledValue labeledValueWithLabel:@"Home" value:email];
+    [email_addresses addObject:labeled_value];
+  }
+
+  return email_addresses;
+}
+
+NSDateComponents* ParseBirthday(std::string birth_day) {
+  NSString *bday = [NSString stringWithUTF8String:birth_day.c_str()];
+  NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+  [formatter setDateFormat:@"yyyy-MM-dd"];
+
+  NSDate *bday_date = [formatter dateFromString:bday];
+
+  NSCalendar *cal = [NSCalendar currentCalendar];
+  unsigned unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit |  NSDayCalendarUnit;
+  NSDateComponents *birthday_components = [cal components:unitFlags fromDate:bday_date];
+
+  return birthday_components;
+}
+
 CNAuthorizationStatus AuthStatus() {
   CNEntityType entityType = CNEntityTypeContacts;
   return [CNContactStore authorizationStatusForEntityType:entityType];
@@ -172,36 +215,40 @@ CNAuthorizationStatus AuthStatus() {
   if (AuthStatus() != CNAuthorizationStatusAuthorized)
     return Napi::Boolean::New(env, false);
 
-  // Parse Contact object data
   CNMutableContact *contact = [[CNMutableContact alloc] init];
   Napi::Object contact_data = info[0].As<Napi::Object>();
-  if(contact_data.Has("firstName")) {
+
+  if (contact_data.Has("firstName")) {
     std::string first_name = contact_data.Get("firstName").As<Napi::String>().Utf8Value();
     [contact setGivenName:[NSString stringWithUTF8String:first_name.c_str()]];
   }
 
-  if(contact_data.Has("lastName")) {
+  if (contact_data.Has("lastName")) {
     std::string last_name = contact_data.Get("lastName").As<Napi::String>().Utf8Value();
     [contact setFamilyName:[NSString stringWithUTF8String:last_name.c_str()]];
   }
 
-  if(contact_data.Has("nickname")) {
+  if (contact_data.Has("nickname")) {
     std::string nick_name = contact_data.Get("nickname").As<Napi::String>().Utf8Value();
     [contact setFamilyName:[NSString stringWithUTF8String:nick_name.c_str()]];
   }
 
-  if(contact_data.Has("birthday")) {
+  if (contact_data.Has("birthday")) {
     std::string birth_day = contact_data.Get("birthday").As<Napi::String>().Utf8Value();
-    NSString *bday = [NSString stringWithUTF8String:birth_day.c_str()];
-    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-    [formatter setDateFormat:@"yyyy-MM-dd"];
+    NSDateComponents *birthday_components = ParseBirthday(birth_day);
+    [contact setBirthday:birthday_components];
+  }
 
-    NSDate *bday_date = [formatter dateFromString:bday];
+  if (contact_data.Has("phoneNumbers")) {
+    Napi::Array phone_number_data = contact_data.Get("phoneNumbers").As<Napi::Array>();
+    NSArray *phone_numbers = ParsePhoneNumbers(phone_number_data);
+    [contact setPhoneNumbers:[NSArray arrayWithArray:phone_numbers]];
+  }
 
-    NSCalendar *cal = [NSCalendar currentCalendar];
-    unsigned unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit |  NSDayCalendarUnit;
-    NSDateComponents *birthday_components = [cal components:unitFlags fromDate:bday_date];
-    [contact setBirthday:birthday_components];
+  if (contact_data.Has("emailAddresses")) {
+    Napi::Array email_address_data = contact_data.Get("emailAddresses").As<Napi::Array>();
+    NSArray *email_addresses = ParseEmailAddresses(email_address_data);
+    [contact setEmailAddresses:[NSArray arrayWithArray:email_addresses]];
   }
 
   CNSaveRequest *request = [[CNSaveRequest alloc] init];

index.js

@@ -15,14 +15,12 @@ function addNewContact(contact) {
     const hasNickname = contact.hasOwnProperty('nickname')
     const hasBirthday = contact.hasOwnProperty('birthday')
     const hasPhoneNumbers = contact.hasOwnProperty('phoneNumbers')
-    const hasPostalAddresses = contact.hasOwnProperty('postalAddresses')
     const hasEmailAddresses = contact.hasOwnProperty('emailAddresses')
 
     if (hasFirstName && typeof contact.firstName !== 'string') throw new TypeError('firstName must be a string')
     if (hasLastName && typeof contact.lastName !== 'string') throw new TypeError('lastName must be a string')
     if (hasNickname && typeof contact.nickname !== 'string') throw new TypeError('nickname must be a string')
     if (hasPhoneNumbers && !Array.isArray(contact.phoneNumbers)) throw new TypeError('phoneNumbers must be an array')
-    if (hasPostalAddresses && !Array.isArray(contact.postalAddresses)) throw new TypeError('postalAddresses must be an array')
     if (hasEmailAddresses && !Array.isArray(contact.emailAddresses)) throw new TypeError('emailAddresses must be an array')
 
     if (hasBirthday) {