Merge platform modules

README.md

@@ -150,25 +150,25 @@ The current supported permissions are:
 
 |                    | Type                | iOS | Android |
 | ------------------ | ------------------- | --- | ------- |
-| Location           | `location`          | ✔️  | ✔       |
 | Camera             | `camera`            | ✔️  | ✔       |
-| Microphone         | `microphone`        | ✔️  | ✔       |
-| Photos             | `photo`             | ✔️  | ✔       |
 | Contacts           | `contacts`          | ✔️  | ✔       |
 | Events             | `event`             | ✔️  | ✔       |
-| Coarse location    | `coarseLocation`    | ❌  | ✔       |
-| Bluetooth          | `bluetooth`         | ✔️  | ❌      |
-| Reminders          | `reminder`          | ✔️  | ❌      |
-| Push Notifications | `notification`      | ✔️  | ❌      |
+| Location           | `location`          | ✔️  | ✔       |
+| Microphone         | `microphone`        | ✔️  | ✔       |
+| Photos             | `photo`             | ✔️  | ✔       |
 | Background Refresh | `backgroundRefresh` | ✔️  | ❌      |
-| Speech Recognition | `speechRecognition` | ✔️  | ❌      |
+| Bluetooth          | `bluetooth`         | ✔️  | ❌      |
 | Media Library      | `mediaLibrary`      | ✔️  | ❌      |
 | Motion Activity    | `motion`            | ✔️  | ❌      |
-| Storage            | `storage`           | ❌️ | ✔       |
+| Push Notifications | `notification`      | ✔️  | ❌      |
+| Reminders          | `reminder`          | ✔️  | ❌      |
+| Speech Recognition | `speechRecognition` | ✔️  | ❌      |
+| Coarse location    | `coarseLocation`    | ❌  | ✔       |
 | Phone Call         | `callPhone`         | ❌️ | ✔       |
 | Read SMS           | `readSms`           | ❌️ | ✔       |
 | Receive SMS        | `receiveSms`        | ❌️ | ✔       |
 | Send SMS           | `sendSms`           | ❌️ | ✔       |
+| Storage            | `storage`           | ❌️ | ✔       |
 
 ### Methods
 

index.js

@@ -1,4 +1,204 @@
 // @flow
 
-import Permissions from './lib/permissions';
-export default Permissions;
+import {NativeModules, PermissionsAndroid, Platform} from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
+const NativeModule = NativeModules.ReactNativePermissions;
+
+export type PermissionStatus =
+  | 'authorized'
+  | 'denied'
+  | 'restricted'
+  | 'undetermined';
+
+export type Rationale = {
+  title: string,
+  message: string,
+  buttonPositive?: string,
+  buttonNegative?: string,
+  buttonNeutral?: string,
+};
+
+const ASYNC_STORAGE_KEY = '@RNPermissions:didAskPermission:';
+
+const PERMISSIONS = Platform.select({
+  ios: {
+    backgroundRefresh: 'backgroundRefresh',
+    bluetooth: 'bluetooth',
+    camera: 'camera',
+    contacts: 'contacts',
+    event: 'event',
+    location: 'location',
+    mediaLibrary: 'mediaLibrary',
+    microphone: 'microphone',
+    motion: 'motion',
+    notification: 'notification',
+    photo: 'photo',
+    reminder: 'reminder',
+    speechRecognition: 'speechRecognition',
+  },
+  android: {
+    callPhone: PermissionsAndroid.PERMISSIONS.CALL_PHONE,
+    camera: PermissionsAndroid.PERMISSIONS.CAMERA,
+    coarseLocation: PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION,
+    contacts: PermissionsAndroid.PERMISSIONS.READ_CONTACTS,
+    event: PermissionsAndroid.PERMISSIONS.READ_CALENDAR,
+    location: PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
+    microphone: PermissionsAndroid.PERMISSIONS.RECORD_AUDIO,
+    photo: PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+    readSms: PermissionsAndroid.PERMISSIONS.READ_SMS,
+    receiveSms: PermissionsAndroid.PERMISSIONS.RECEIVE_SMS,
+    sendSms: PermissionsAndroid.PERMISSIONS.SEND_SMS,
+    storage: PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+  },
+});
+
+const IOS_DEFAULT_OPTIONS = {
+  location: 'whenInUse',
+  notification: ['alert', 'badge', 'sound'],
+};
+
+const ANDROID_RESULTS = {
+  granted: 'authorized',
+  denied: 'denied',
+  never_ask_again: 'restricted',
+};
+
+const setDidAskOnce = (permission: string) =>
+  AsyncStorage.setItem(ASYNC_STORAGE_KEY + permission, 'true');
+
+const getDidAskOnce = (permission: string) =>
+  AsyncStorage.getItem(ASYNC_STORAGE_KEY + permission).then(item => !!item);
+
+class ReactNativePermissions {
+  canOpenSettings(): Promise<boolean> {
+    return Platform.OS === 'ios'
+      ? NativeModule.canOpenSettings().then(result => !!result)
+      : Promise.resolve(false);
+  }
+
+  openSettings(): Promise<void> {
+    return Platform.OS === 'ios'
+      ? NativeModule.openSettings()
+      : Promise.reject(new Error("'openSettings' is deprecated on android"));
+  }
+
+  getTypes(): string[] {
+    return Object.keys(PERMISSIONS);
+  }
+
+  check = (
+    permission: string,
+    options?: string | {type?: string},
+  ): Promise<PermissionStatus> => {
+    if (!PERMISSIONS[permission]) {
+      return Promise.reject(
+        new Error(
+          `ReactNativePermissions: ${permission} is not a valid permission type`,
+        ),
+      );
+    }
+
+    if (Platform.OS === 'ios') {
+      let type = IOS_DEFAULT_OPTIONS[permission];
+
+      if (typeof options === 'string') {
+        type = options;
+      } else if (options && options.type) {
+        type = options.type;
+      }
+
+      return NativeModule.getPermissionStatus(permission, type);
+    }
+
+    if (Platform.OS === 'android') {
+      return PermissionsAndroid.check(PERMISSIONS[permission]).then(granted => {
+        if (granted) {
+          return 'authorized';
+        }
+
+        return getDidAskOnce(permission).then(didAsk => {
+          if (didAsk) {
+            return NativeModules.PermissionsAndroid.shouldShowRequestPermissionRationale(
+              PERMISSIONS[permission],
+            ).then(shouldShow => (shouldShow ? 'denied' : 'restricted'));
+          }
+
+          return 'undetermined';
+        });
+      });
+    }
+
+    return Promise.resolve('restricted');
+  };
+
+  request = (
+    permission: string,
+    options?: string | {type?: string, rationale?: Rationale},
+  ): Promise<PermissionStatus> => {
+    if (!PERMISSIONS[permission]) {
+      return Promise.reject(
+        new Error(
+          `ReactNativePermissions: ${permission} is not a valid permission type`,
+        ),
+      );
+    }
+
+    if (Platform.OS === 'ios') {
+      if (permission == 'backgroundRefresh') {
+        return Promise.reject(
+          new Error(
+            'ReactNativePermissions: You cannot request backgroundRefresh',
+          ),
+        );
+      }
+
+      let type = IOS_DEFAULT_OPTIONS[permission];
+
+      if (typeof options === 'string') {
+        type = options;
+      } else if (options && options.type) {
+        type = options.type;
+      }
+
+      return NativeModule.requestPermission(permission, type);
+    }
+
+    if (Platform.OS === 'android') {
+      let rationale: Rationale;
+
+      if (typeof options === 'object' && options.rationale) {
+        rationale = options.rationale;
+      }
+
+      return PermissionsAndroid.request(
+        PERMISSIONS[permission],
+        rationale,
+      ).then(result => {
+        // PermissionsAndroid.request() to native module resolves to boolean
+        // rather than string if running on OS version prior to Android M
+        if (typeof result === 'boolean') {
+          return result ? 'authorized' : 'denied';
+        }
+
+        return setDidAskOnce(permission).then(() => ANDROID_RESULTS[result]);
+      });
+    }
+
+    return Promise.resolve('restricted');
+  };
+
+  checkMultiple = (
+    permissions: string[],
+  ): Promise<{[permission: string]: PermissionStatus}> => {
+    return Promise.all(
+      permissions.map(permission => this.check(permission)),
+    ).then(result =>
+      result.reduce((acc, value, i) => {
+        acc[permissions[i]] = value;
+        return acc;
+      }, {}),
+    );
+  };
+}
+
+export default new ReactNativePermissions();

lib/permissions.android.js

@@ -1,116 +0,0 @@
-// @flow
-
-import {NativeModules, PermissionsAndroid} from 'react-native';
-import AsyncStorage from '@react-native-community/async-storage';
-
-type Status = 'authorized' | 'denied' | 'restricted' | 'undetermined';
-type Rationale = {title: string, message: string};
-type CheckOptions = string | {type: string};
-type RequestOptions = string | {type: string, rationale?: Rationale};
-
-const permissionTypes = {
-  location: PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
-  coarseLocation: RNPermissions.PERMISSIONS.ACCESS_COARSE_LOCATION,
-  camera: PermissionsAndroid.PERMISSIONS.CAMERA,
-  microphone: PermissionsAndroid.PERMISSIONS.RECORD_AUDIO,
-  contacts: PermissionsAndroid.PERMISSIONS.READ_CONTACTS,
-  event: PermissionsAndroid.PERMISSIONS.READ_CALENDAR,
-  storage: PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
-  photo: PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
-  callPhone: PermissionsAndroid.PERMISSIONS.CALL_PHONE,
-  readSms: PermissionsAndroid.PERMISSIONS.READ_SMS,
-  receiveSms: PermissionsAndroid.PERMISSIONS.RECEIVE_SMS,
-  sendSms: PermissionsAndroid.PERMISSIONS.SEND_SMS,
-};
-
-const RESULTS = {
-  [PermissionsAndroid.RESULTS.GRANTED]: 'authorized',
-  [PermissionsAndroid.RESULTS.DENIED]: 'denied',
-  [PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN]: 'restricted',
-};
-
-const STORAGE_KEY = '@RNPermissions:didAskPermission:';
-
-const setDidAskOnce = (permission: string) =>
-  AsyncStorage.setItem(STORAGE_KEY + permission, 'true');
-
-const getDidAskOnce = (permission: string) =>
-  AsyncStorage.getItem(STORAGE_KEY + permission).then(item => !!item);
-
-class ReactNativePermissions {
-  canOpenSettings: () => Promise<boolean> = () => Promise.resolve(false);
-
-  openSettings: () => Promise<*> = () =>
-    Promise.reject(new Error("'openSettings' is deprecated on android"));
-
-  getTypes: () => Array<string> = () => Object.keys(permissionTypes);
-
-  check = (permission: string, options?: CheckOptions): Promise<Status> => {
-    if (!permissionTypes[permission]) {
-      const error = new Error(
-        `ReactNativePermissions: ${permission} is not a valid permission type on Android`,
-      );
-
-      return Promise.reject(error);
-    }
-
-    return PermissionsAndroid.check(permissionTypes[permission]).then(
-      isAuthorized => {
-        if (isAuthorized) {
-          return 'authorized';
-        }
-
-        return getDidAskOnce(permission).then(didAsk => {
-          if (didAsk) {
-            return NativeModules.PermissionsAndroid.shouldShowRequestPermissionRationale(
-              permissionTypes[permission],
-            ).then(shouldShow => (shouldShow ? 'denied' : 'restricted'));
-          }
-
-          return 'undetermined';
-        });
-      },
-    );
-  };
-
-  request = (permission: string, options?: RequestOptions): Promise<Status> => {
-    if (!permissionTypes[permission]) {
-      const error = new Error(
-        `ReactNativePermissions: ${permission} is not a valid permission type on Android`,
-      );
-
-      return Promise.reject(error);
-    }
-
-    let rationale;
-
-    if (options && options.rationale) {
-      rationale = options.rationale;
-    }
-
-    return PermissionsAndroid.request(
-      permissionTypes[permission],
-      rationale,
-    ).then(result => {
-      // PermissionsAndroid.request() to native module resolves to boolean
-      // rather than string if running on OS version prior to Android M
-      if (typeof result === 'boolean') {
-        return result ? 'authorized' : 'denied';
-      }
-
-      return setDidAskOnce(permission).then(() => RESULTS[result]);
-    });
-  };
-
-  checkMultiple = (permissions: Array<string>): Promise<{[string]: string}> =>
-    Promise.all(permissions.map(permission => this.check(permission))).then(
-      result =>
-        result.reduce((acc, value, index) => {
-          const name = permissions[index];
-          acc[name] = value;
-          return acc;
-        }, {}),
-    );
-}
-
-export default new ReactNativePermissions();

lib/permissions.ios.js

@@ -1,105 +0,0 @@
-// @flow
-
-import {NativeModules} from 'react-native';
-const PermissionsIOS = NativeModules.ReactNativePermissions;
-
-type Status = 'authorized' | 'denied' | 'restricted' | 'undetermined';
-type Rationale = {title: string, message: string};
-type CheckOptions = string | {type: string};
-type RequestOptions = string | {type: string, rationale?: Rationale};
-
-const permissionTypes = [
-  'location',
-  'camera',
-  'microphone',
-  'photo',
-  'contacts',
-  'event',
-  'reminder',
-  'bluetooth',
-  'notification',
-  'backgroundRefresh',
-  'speechRecognition',
-  'mediaLibrary',
-  'motion',
-];
-
-const DEFAULTS = {
-  location: 'whenInUse',
-  notification: ['alert', 'badge', 'sound'],
-};
-
-class ReactNativePermissions {
-  canOpenSettings: () => Promise<boolean> = () =>
-    PermissionsIOS.canOpenSettings().then(result => !!result);
-
-  openSettings: () => Promise<*> = () => PermissionsIOS.openSettings();
-
-  getTypes: () => Array<string> = () => permissionTypes;
-
-  check = (permission: string, options?: CheckOptions): Promise<Status> => {
-    if (!permissionTypes.includes(permission)) {
-      const error = new Error(
-        `ReactNativePermissions: ${permission} is not a valid permission type on iOS`,
-      );
-
-      return Promise.reject(error);
-    }
-
-    let type;
-
-    if (typeof options === 'string') {
-      type = options;
-    } else if (options && options.type) {
-      type = options.type;
-    }
-
-    return PermissionsIOS.getPermissionStatus(
-      permission,
-      type || DEFAULTS[permission],
-    );
-  };
-
-  request = (permission: string, options?: RequestOptions): Promise<Status> => {
-    if (!permissionTypes.includes(permission)) {
-      const error = new Error(
-        `ReactNativePermissions: ${permission} is not a valid permission type on iOS`,
-      );
-
-      return Promise.reject(error);
-    }
-
-    if (permission == 'backgroundRefresh') {
-      const error = new Error(
-        'ReactNativePermissions: You cannot request backgroundRefresh',
-      );
-
-      return Promise.reject(error);
-    }
-
-    let type;
-
-    if (typeof options === 'string') {
-      type = options;
-    } else if (options && options.type) {
-      type = options.type;
-    }
-
-    return PermissionsIOS.requestPermission(
-      permission,
-      type || DEFAULTS[permission],
-    );
-  };
-
-  checkMultiple = (permissions: Array<string>): Promise<{[string]: string}> =>
-    Promise.all(permissions.map(permission => this.check(permission))).then(
-      result =>
-        result.reduce((acc, value, index) => {
-          const name = permissions[index];
-          acc[name] = value;
-          return acc;
-        }, {}),
-    );
-}
-
-export default new ReactNativePermissions();