Add Authorization Options for Provisional Notifications (#442)

* Add Authorization Options for Provisional Notifications

• When using provisional notifications, when a user receives a notifications and taps 'Deliver Prominently', they should be able to receive normal notifications with sound, badge, etc.
• However it appears that with the current SDK, when a user taps 'Deliver Prominently', the notifications don't make sounds/badges until the user opens the app again.
• This can be fixed by requesting full authorization options immediately when registering for provisional notifications

* Fix Permission State

• The last commit did not correctly detect the new value for provisional notifications' UNAuthorizationOption in the UNUserNotificationCenter+OneSignal category requestAuthorizationWithOptions swizzle.
• This resulted in the permission state not getting updated correctly and caused tests to fail.

* Correctly Check for Enum Membership

• We have a swizzled implementation of requestAuthorizationWithOptions: in case developers call it directly instead of using our SDK's prompt methods
• We needed to check if the app was requesting provisional authorization which would cause the prompt not to be shown.
• However we were incorrectly evaluating equality of the raw value for the provisional authorization enum case instead of checking for enum membership (which would be a bitmask that could potentially contain multiple cases)

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -59,6 +59,10 @@
 #define PROVISIONAL_UNAUTHORIZATIONOPTION (UNAuthorizationOptions)(1 << 6)
 #define PROVIDES_SETTINGS_UNAUTHORIZATIONOPTION (UNAuthorizationOptions)(1 << 5)
 
+// These options are defined in all versions of iOS that we support, so we
+// can use them directly.
+#define DEFAULT_UNAUTHORIZATIONOPTIONS (UNAuthorizationOptionSound + UNAuthorizationOptionBadge + UNAuthorizationOptionAlert)
+
 // iOS Parameter Names
 #define IOS_USES_PROVISIONAL_AUTHORIZATION @"uses_provisional_auth"
 #define IOS_REQUIRES_EMAIL_AUTHENTICATION @"require_email_auth"

iOS_SDK/OneSignalSDK/Source/OneSignalNotificationSettingsIOS10.m

@@ -176,16 +176,18 @@ - (void)registerForProvisionalAuthorization:(void(^)(BOOL accepted))completionHa
 
     UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
 
+    let options = PROVISIONAL_UNAUTHORIZATIONOPTION + DEFAULT_UNAUTHORIZATIONOPTIONS;
+    
     id responseBlock = ^(BOOL granted, NSError *error) {
         [OneSignalHelper dispatch_async_on_main_queue:^{
-            OneSignal.currentPermissionState.provisional = granted;
-            [OneSignal updateNotificationTypes: granted ? PROVISIONAL_UNAUTHORIZATIONOPTION : 0];
+            OneSignal.currentPermissionState.provisional = true;
+            [OneSignal updateNotificationTypes: options];
             if (completionHandler)
                 completionHandler(granted);
         }];
     };
 
-    [center requestAuthorizationWithOptions:PROVISIONAL_UNAUTHORIZATIONOPTION completionHandler:responseBlock];
+    [center requestAuthorizationWithOptions:options completionHandler:responseBlock];
 }
 
 // Ignore these 2 events, promptForNotifications: already takes care of these.

iOS_SDK/OneSignalSDK/Source/UNUserNotificationCenter+OneSignal.m

@@ -94,9 +94,12 @@ + (void)setUseiOS10_2_workaround:(BOOL)enable {
 static BOOL useCachedUNNotificationSettings;
 static UNNotificationSettings* cachedUNNotificationSettings;
 
+// This is a swizzled implementation of requestAuthorizationWithOptions:
+// in case developers call it directly instead of using our prompt method
 - (void)onesignalRequestAuthorizationWithOptions:(UNAuthorizationOptions)options completionHandler:(void (^)(BOOL granted, NSError *__nullable error))completionHandler {
 
-    BOOL notProvisionalRequest = options != PROVISIONAL_UNAUTHORIZATIONOPTION;
+    // check options for UNAuthorizationOptionProvisional membership
+    BOOL notProvisionalRequest = (options & PROVISIONAL_UNAUTHORIZATIONOPTION) == 0;
 
     //we don't want to modify these settings if the authorization is provisional (iOS 12 'Direct to History')
     if (notProvisionalRequest)

iOS_SDK/OneSignalSDK/UnitTests/ProvisionalAuthorizationTests.m

@@ -84,7 +84,9 @@ - (void)testProvisionalPermissionState {
 
         [UnitTestCommonMethods runBackgroundThreads];
 
-        XCTAssertTrue(UNUserNotificationCenterOverrider.lastRequestedAuthorizationOptions == PROVISIONAL_UNAUTHORIZATIONOPTION);
+        let options = PROVISIONAL_UNAUTHORIZATIONOPTION + DEFAULT_UNAUTHORIZATIONOPTIONS;
+        
+        XCTAssertTrue(UNUserNotificationCenterOverrider.lastRequestedAuthorizationOptions == options);
 
         XCTAssertTrue(observer->last.to.provisional);
         XCTAssertFalse(observer->last.from.provisional);