Merge pull request #753 from Lee-sungheon/master

Add limited contact permission for iOS 18
morenoh149 · Sep 30, 2024 · 2a789cb · 2a789cb
2 parents 50c145e + d2e4a0c
commit 2a789cb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -362,6 +362,9 @@ Contacts.checkPermission().then(permission => {
  if (permission === 'authorized') {
  // yay!
  }
+ if (permission === 'limited') {
+ // ...
+ }
  if (permission === 'denied') {
  // x.x
  }

diff --git a/index.ts b/index.ts
@@ -1,6 +1,6 @@
 import { NativeModules } from "react-native";
 import NativeContacts from "./src/NativeContacts";
-import { Contact } from "./type";
+import { Contact, PermissionType } from "./type";
 
 const isTurboModuleEnabled = global.__turboModuleProxy != null;
 const Contacts = isTurboModuleEnabled ? NativeContacts : NativeModules.Contacts;
@@ -73,15 +73,11 @@ async function getContactsByEmailAddress(
  return Contacts.getContactsByEmailAddress(emailAddress);
 }
 
-async function checkPermission(): Promise<
- "authorized" | "denied" | "undefined"
-> {
+async function checkPermission(): Promise<PermissionType> {
  return Contacts.checkPermission();
 }
 
-async function requestPermission(): Promise<
- "authorized" | "denied" | "undefined"
-> {
+async function requestPermission(): Promise<PermissionType> {
  return Contacts.requestPermission();
 }
 

diff --git a/ios/.DS_Store b/ios/.DS_Store
diff --git a/ios/RCTContacts/RCTContacts.mm b/ios/RCTContacts/RCTContacts.mm
@@ -44,6 +44,7 @@ - (NSDictionary *)constantsToExport
  return @{
  @"PERMISSION_DENIED": @"denied",
  @"PERMISSION_AUTHORIZED": @"authorized",
+ @"PERMISSION_LIMITED": @"limited",
  @"PERMISSION_UNDEFINED": @"undefined"
  };
 }
@@ -63,6 +64,8 @@ - (NSDictionary *)constantsToExport
  resolve(@"denied");
  } else if (authStatus == CNAuthorizationStatusAuthorized){
  resolve(@"authorized");
+ } else if (authStatus == CNAuthorizationStatusLimited) {
+ resolve(@"limited");
  } else {
  resolve(@"undefined");
  }
@@ -565,7 +568,7 @@ - (NSString *)getPathForDirectory:(int)directory
  }
  }];
  }
- else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
+ else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited)
  {
  resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
  }
@@ -603,7 +606,7 @@ -(NSString *) getFilePathForThumbnailImage:(NSString *)recordID
  }
  }];
  }
- else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
+ else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
  {
  resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
  }
@@ -1285,6 +1288,8 @@ - (void)checkPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseReject
  resolve(@"denied");
  } else if (authStatus == CNAuthorizationStatusAuthorized){
  resolve(@"authorized");
+ } else if (authStatus == CNAuthorizationStatusLimited) {
+ resolve(@"limited");
  } else {
  resolve(@"undefined");
  }
@@ -1435,7 +1440,7 @@ - (void)getContactById:(nonnull NSString *)recordID resolve:(RCTPromiseResolveBl
  }
  }];
  }
- else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
+ else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
  {
  resolve([self getContact:recordID addressBook:contactStore withThumbnails:false]);
  }
@@ -1485,7 +1490,7 @@ - (void)getPhotoForId:(nonnull NSString *)recordID resolve:(RCTPromiseResolveBlo
  }
  }];
  }
- else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized)
+ else if( [CNContactStore authorizationStatusForEntityType:entityType]== CNAuthorizationStatusAuthorized || [CNContactStore authorizationStatusForEntityType:entityType] == CNAuthorizationStatusLimited))
  {
  resolve([self getFilePathForThumbnailImage:recordID addressBook:contactStore]);
  }

diff --git a/src/NativeContacts.ts b/src/NativeContacts.ts
@@ -1,6 +1,6 @@
 import type { TurboModule } from "react-native/Libraries/TurboModule/RCTExport";
 import { TurboModuleRegistry } from "react-native";
-import { Contact } from "../type";
+import { Contact, PermissionType } from "../type";
 
 export interface Spec extends TurboModule {
  getAll: () => Promise<any>;
@@ -18,8 +18,8 @@ export interface Spec extends TurboModule {
  getContactsMatchingString: (str: string) => Promise<Contact[]>;
  getContactsByPhoneNumber: (phoneNumber: string) => Promise<Contact[]>;
  getContactsByEmailAddress: (emailAddress: string) => Promise<Contact[]>;
- checkPermission: () => Promise<string>;
- requestPermission: () => Promise<string>;
+ checkPermission: () => Promise<PermissionType>;
+ requestPermission: () => Promise<PermissionType>;
  writePhotoToPath: (contactId: string, file: string) => Promise<boolean>;
  iosEnableNotesUsage: (enabled: boolean) => void;
 }

diff --git a/type.ts b/type.ts
@@ -60,3 +60,5 @@ export interface Contact {
  urlAddresses: UrlAddress[];
  note: string;
 }
+
+export type PermissionType = 'authorized' | 'limited' | 'denied' | 'undefined'