Do not add nil objects

jpalumickas · Sep 24, 2020 · bd6459e · bd6459e
1 parent 7e436e0
commit bd6459e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/AppleLogin.m b/AppleLogin.m
@@ -35,10 +35,10 @@ - (void)authorizationController:(ASAuthorizationController *)controller didCompl
 
  NSPersonNameComponents *fullName = appleIDCredential.fullName;
  NSDictionary *userDetails = @{
- @"firstName": fullName.givenName ?: nil,
- @"middleName": fullName.middleName ?: nil,
- @"lastName": fullName.familyName ?: nil,
- @"email" : appleIDCredential.email,
+ @"firstName": fullName.givenName ?: @"",
+ @"middleName": fullName.middleName ?: @"",
+ @"lastName": fullName.familyName ?: @"",
+ @"email" : appleIDCredential.email ?: @"",
  @"idToken" : idToken,
  };
 

diff --git a/main.mm b/main.mm
@@ -34,9 +34,11 @@
 
  for (NSString* key in result) {
  NSString *value = result[key];
- std::string napiKey = std::string([key UTF8String]);
- Napi::Value napiValue = Napi::Value::From(env, [[NSString stringWithFormat:@"%@", value] UTF8String]);
- obj.Set(napiKey, napiValue);
+ if(value != nil && [value length] > 0) {
+ std::string napiKey = std::string([key UTF8String]);
+ Napi::Value napiValue = Napi::Value::From(env, [[NSString stringWithFormat:@"%@", value] UTF8String]);
+ obj.Set(napiKey, napiValue);
+ }
  }
 
  deferred.Resolve(obj);