@react-native-firebase/analytics 18.7.3 → 18.9.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [18.9.0](https://github.com/invertase/react-native-firebase/compare/v18.8.0...v18.9.0) (2024-02-21)
+
+### Features
+
+- **analytics:** add setConsent implementation ([#7629](https://github.com/invertase/react-native-firebase/issues/7629)) ([7816985](https://github.com/invertase/react-native-firebase/commit/78169854f16a2715f5d2657ab08f54d5a4b05281))
+
+## [18.8.0](https://github.com/invertase/react-native-firebase/compare/v18.7.3...v18.8.0) (2024-01-25)
+
+**Note:** Version bump only for package @react-native-firebase/analytics
+
 ## [18.7.3](https://github.com/invertase/react-native-firebase/compare/v18.7.2...v18.7.3) (2023-12-13)
 
 **Note:** Version bump only for package @react-native-firebase/analytics

package/__tests__/analytics.test.ts

@@ -98,6 +98,31 @@ describe('Analytics', function () {
     );
   });
 
+  it('throws if consentSettings is not an object', function () {
+    // @ts-ignore test
+    expect(() => firebase.analytics().setConsent(1337)).toThrowError(
+      'The supplied arg must be an object of key/values.',
+    );
+  });
+  it('throws if consentSettings is invalid', function () {
+    const consentSettings = {
+      ad_storage: true,
+      foo: {
+        bar: 'baz',
+      },
+    };
+    // @ts-ignore test
+    expect(() => firebase.analytics().setConsent(consentSettings)).toThrowError(
+      "'consentSettings' value for parameter 'foo' is invalid, expected a boolean.",
+    );
+  });
+  it('throws if one value of consentSettings is a number', function () {
+    // @ts-ignore test
+    expect(() => firebase.analytics().setConsent({ ad_storage: 123 })).toThrowError(
+      "'consentSettings' value for parameter 'ad_storage' is invalid, expected a boolean.",
+    );
+  });
+
   it('errors when no parameters are set', function () {
     // @ts-ignore test
     expect(() => firebase.analytics().logSearch()).toThrowError(

package/android/build.gradle

@@ -65,8 +65,11 @@ apply from: file('./../../app/android/firebase-json.gradle')
 String collectionDeactivated = 'false'
 String adidEnabled = 'true'
 String ssaidEnabled = 'true'
-String personalizationEnabled = 'true'
 String automaticScreenReportingEnabled = 'true'
+String analyticsStorageEnabled = 'true'
+String adStorageEnabled = 'true'
+String adUserDataEnabled = 'true'
+String personalizationEnabled = 'true'
 
 // If nothing is defined, data collection defaults to true
 String dataCollectionEnabled = 'true'
@@ -96,12 +99,21 @@ if (rootProject.ext && rootProject.ext.firebaseJson) {
   if (rnfbConfig.isFlagEnabled('google_analytics_ssaid_collection_enabled', true) == false) {
     ssaidEnabled = 'false'
   }
-  if (rnfbConfig.isFlagEnabled('analytics_default_allow_ad_personalization_signals', true) == false) {
-    personalizationEnabled = 'false'
-  }
   if (rnfbConfig.isFlagEnabled('google_analytics_automatic_screen_reporting_enabled', true) == false) {
     automaticScreenReportingEnabled = 'false'
   }
+  if (rnfbConfig.isFlagEnabled('analytics_default_allow_analytics_storage', true) == false) {
+    analyticsStorageEnabled = 'false'
+  }
+  if (rnfbConfig.isFlagEnabled('analytics_default_allow_ad_storage', true) == false) {
+    adStorageEnabled = 'false'
+  }
+  if (rnfbConfig.isFlagEnabled('analytics_default_allow_ad_user_data', true) == false) {
+    adUserDataEnabled = 'false'
+  }
+  if (rnfbConfig.isFlagEnabled('analytics_default_allow_ad_personalization_signals', true) == false) {
+    personalizationEnabled = 'false'
+  }
 }
 
 android {
@@ -117,8 +129,11 @@ android {
       firebaseJsonCollectionDeactivated: collectionDeactivated,
       firebaseJsonAdidEnabled: adidEnabled,
       firebaseJsonSsaidEnabled: ssaidEnabled,
-      firebaseJsonPersonalizationEnabled: personalizationEnabled,
-      firebaseJsonAutomaticScreenReportingEnabled: automaticScreenReportingEnabled
+      firebaseJsonAutomaticScreenReportingEnabled: automaticScreenReportingEnabled,
+      firebaseJsonAnalyticsStorageEnabled: analyticsStorageEnabled,
+      firebaseJsonAdStorageEnabled: adStorageEnabled,
+      firebaseJsonAdUserDataEnabled: adUserDataEnabled,
+      firebaseJsonPersonalizationEnabled: personalizationEnabled
     ]
   }
 

package/android/src/main/AndroidManifest.xml

@@ -11,7 +11,11 @@
     <meta-data android:name="firebase_analytics_collection_deactivated" android:value="${firebaseJsonCollectionDeactivated}" />
     <meta-data android:name="google_analytics_adid_collection_enabled" android:value="${firebaseJsonAdidEnabled}" />
     <meta-data android:name="google_analytics_ssaid_collection_enabled" android:value="${firebaseJsonSsaidEnabled}" />
-    <meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="${firebaseJsonPersonalizationEnabled}" />
     <meta-data android:name="google_analytics_automatic_screen_reporting_enabled" android:value="${firebaseJsonAutomaticScreenReportingEnabled}" />
+    <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="${firebaseJsonAnalyticsStorageEnabled}" />
+    <meta-data android:name="google_analytics_default_allow_ad_storage" android:value="${firebaseJsonAdStorageEnabled}" />
+    <meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="${firebaseJsonAdUserDataEnabled}" />
+    <meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="${firebaseJsonPersonalizationEnabled}" />
+
   </application>
 </manifest>

package/android/src/main/java/io/invertase/firebase/analytics/UniversalFirebaseAnalyticsModule.java

@@ -22,7 +22,11 @@ import android.os.Bundle;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.analytics.FirebaseAnalytics;
+import com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus;
+import com.google.firebase.analytics.FirebaseAnalytics.ConsentType;
 import io.invertase.firebase.common.UniversalFirebaseModule;
+import java.util.EnumMap;
+import java.util.Map;
 import java.util.Set;
 
 @SuppressWarnings("WeakerAccess")
@@ -109,4 +113,29 @@ public class UniversalFirebaseAnalyticsModule extends UniversalFirebaseModule {
           return null;
         });
   }
+
+  Task<Void> setConsent(Bundle consentSettings) {
+    return Tasks.call(
+        () -> {
+          boolean analyticsStorage = consentSettings.getBoolean("analytics_storage");
+          boolean adStorage = consentSettings.getBoolean("ad_storage");
+          boolean adUserData = consentSettings.getBoolean("ad_user_data");
+          boolean adPersonalization = consentSettings.getBoolean("ad_personalization");
+
+          Map<ConsentType, ConsentStatus> consentMap = new EnumMap<>(ConsentType.class);
+          consentMap.put(
+              ConsentType.ANALYTICS_STORAGE,
+              analyticsStorage ? ConsentStatus.GRANTED : ConsentStatus.DENIED);
+          consentMap.put(
+              ConsentType.AD_STORAGE, adStorage ? ConsentStatus.GRANTED : ConsentStatus.DENIED);
+          consentMap.put(
+              ConsentType.AD_USER_DATA, adUserData ? ConsentStatus.GRANTED : ConsentStatus.DENIED);
+          consentMap.put(
+              ConsentType.AD_PERSONALIZATION,
+              adPersonalization ? ConsentStatus.GRANTED : ConsentStatus.DENIED);
+
+          FirebaseAnalytics.getInstance(getContext()).setConsent(consentMap);
+          return null;
+        });
+  }
 }

package/android/src/reactnative/java/io/invertase/firebase/analytics/ReactNativeFirebaseAnalyticsModule.java

@@ -178,6 +178,20 @@ public class ReactNativeFirebaseAnalyticsModule extends ReactNativeFirebaseModul
             });
   }
 
+  @ReactMethod
+  public void setConsent(ReadableMap consentSettings, Promise promise) {
+    module
+        .setConsent(Arguments.toBundle(consentSettings))
+        .addOnCompleteListener(
+            task -> {
+              if (task.isSuccessful()) {
+                promise.resolve(task.getResult());
+              } else {
+                rejectPromiseWithExceptionMap(promise, task.getException());
+              }
+            });
+  }
+
   private Bundle toBundle(ReadableMap readableMap) {
     Bundle bundle = Arguments.toBundle(readableMap);
     if (bundle == null) {

package/ios/RNFBAnalytics/RNFBAnalyticsModule.m

@@ -177,6 +177,29 @@ RCT_EXPORT_METHOD(initiateOnDeviceConversionMeasurementWithPhoneNumber
   return resolve([NSNull null]);
 }
 
+RCT_EXPORT_METHOD(setConsent
+                  : (NSDictionary *)consentSettings resolver
+                  : (RCTPromiseResolveBlock)resolve rejecter
+                  : (RCTPromiseRejectBlock)reject) {
+  @try {
+    BOOL analyticsStorage = [consentSettings[@"analytics_storage"] boolValue];
+    BOOL adStorage = [consentSettings[@"ad_storage"] boolValue];
+    BOOL adUserData = [consentSettings[@"ad_user_data"] boolValue];
+    BOOL adPersonalization = [consentSettings[@"ad_personalization"] boolValue];
+    [FIRAnalytics setConsent:@{
+      FIRConsentTypeAnalyticsStorage : analyticsStorage ? FIRConsentStatusGranted
+                                                        : FIRConsentStatusDenied,
+      FIRConsentTypeAdStorage : adStorage ? FIRConsentStatusGranted : FIRConsentStatusDenied,
+      FIRConsentTypeAdUserData : adUserData ? FIRConsentStatusGranted : FIRConsentStatusDenied,
+      FIRConsentTypeAdPersonalization : adPersonalization ? FIRConsentStatusGranted
+                                                          : FIRConsentStatusDenied,
+    }];
+  } @catch (NSException *exception) {
+    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
+  }
+  return resolve([NSNull null]);
+}
+
 #pragma mark -
 #pragma mark Private methods
 

package/lib/index.d.ts

@@ -774,15 +774,19 @@ export namespace FirebaseAnalyticsTypes {
    */
   export interface ConsentSettings {
     /** Enables storage, such as cookies, related to advertising */
-    ad_storage?: ConsentStatusString;
+    ad_storage?: boolean;
+    /** Sets consent for sending user data to Google for online advertising purposes */
+    ad_user_data?: boolean;
+    /** Sets consent for personalized advertising */
+    ad_personalization?: boolean;
     /** Enables storage, such as cookies, related to analytics (for example, visit duration) */
-    analytics_storage?: ConsentStatusString;
+    analytics_storage?: boolean;
     /**
      * Enables storage that supports the functionality of the website or app such as language settings
      */
-    functionality_storage?: ConsentStatusString;
+    functionality_storage?: boolean;
     /** Enables storage related to personalization such as video recommendations */
-    personalization_storage?: ConsentStatusString;
+    personalization_storage?: boolean;
     /**
      * Enables storage related to security such as authentication functionality, fraud prevention,
      * and other user protection.
@@ -1727,6 +1731,28 @@ export namespace FirebaseAnalyticsTypes {
      * @param phoneNumber phone number in E.164 format - that is a leading + sign, then up to 15 digits, no dashes or spaces.
      */
     initiateOnDeviceConversionMeasurementWithPhoneNumber(phoneNumber: string): Promise<void>;
+
+    /**
+     * For Consent Mode!
+     *
+     * #### Example
+     *
+     * ```js
+     * // Disable consent
+     * await firebase.analytics().setConsent({
+     *  ad_personalization: false,
+     *  analytics_storage: false,
+     *  ad_storage: false,
+     *  ad_user_data: false,
+     * });
+     * ```
+     *
+     * Sets the applicable end user consent state (e.g., for device identifiers) for this app on this device.
+     * Use the consent map to specify individual consent type values.
+     * Settings are persisted across app sessions.
+     * @param consentSettings Consent status settings for each consent type.
+     */
+    setConsent(consentSettings: ConsentSettings): Promise<void>;
   }
 
   /**

package/lib/index.js

@@ -87,6 +87,7 @@ export {
   setDefaultEventParameters,
   initiateOnDeviceConversionMeasurementWithEmailAddress,
   initiateOnDeviceConversionMeasurementWithPhoneNumber,
+  setConsent,
 } from './modular/index';
 
 const ReservedEventNames = [
@@ -261,6 +262,26 @@ class FirebaseAnalyticsModule extends FirebaseModule {
     return this.native.resetAnalyticsData();
   }
 
+  setConsent(consentSettings) {
+    if (!isObject(consentSettings)) {
+      throw new Error(
+        'firebase.analytics().setConsent(*): The supplied arg must be an object of key/values.',
+      );
+    }
+
+    const entries = Object.entries(consentSettings);
+    for (let i = 0; i < entries.length; i++) {
+      const [key, value] = entries[i];
+      if (!isBoolean(value)) {
+        throw new Error(
+          `firebase.analytics().setConsent(*) 'consentSettings' value for parameter '${key}' is invalid, expected a boolean.`,
+        );
+      }
+    }
+
+    return this.native.setConsent(consentSettings);
+  }
+
   /** -------------------
    *        EVENTS
    * -------------------- */

package/lib/modular/index.d.ts

@@ -1189,16 +1189,16 @@ export function initiateOnDeviceConversionMeasurementWithPhoneNumber(
 export function isSupported(): Promise<boolean>;
 
 /**
- * Sets the applicable end user consent state for this web app across all gtag
- * references once Firebase Analytics is initialized. Web only.
+ * Sets the applicable end user consent state for this app.
+ * references once Firebase Analytics is initialized.
  * @param analytics Analytics instance.
  * @param consentSettings See {@link analytics.ConsentSettings}.
- * @returns {void}
+ * @returns {Promise<void>}
  */
 export function setConsent(
   analytics: Analytics,
   consentSettings: FirebaseAnalyticsTypes.ConsentSettings,
-): void;
+): Promise<void>;
 
 /**
  * Configures Firebase Analytics to use custom gtag or dataLayer names.

package/lib/modular/index.js

@@ -648,15 +648,15 @@ export function isSupported() {
 }
 
 /**
- * Sets the applicable end user consent state for this web app across all gtag
- * references once Firebase Analytics is initialized. Web only.
+ * Sets the applicable end user consent state for this app.
+ * references once Firebase Analytics is initialized.
  * @param analytics Analytics instance.
  * @param consentSettings See {@link analytics.ConsentSettings}.
- * @returns {void}
+ * @returns {Promise<void>}
  */
 // eslint-disable-next-line
-export function setConsent(consentSettings) {
-  // Returns nothing until Web implemented.
+export function setConsent(analytics, consentSettings) {
+  return analytics.setConsent(consentSettings);
 }
 
 /**

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '18.7.3';
+module.exports = '18.9.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/analytics",
-  "version": "18.7.3",
+  "version": "18.9.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - The analytics module provides out of the box support with Google Analytics for Firebase. Integration with the Android & iOS allows for in-depth analytical insight reporting, such as device information, location, user actions and more.",
   "main": "lib/index.js",
@@ -22,10 +22,10 @@
     "analytics"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "18.7.3"
+    "@react-native-firebase/app": "18.9.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "605a0df8171c451513125629355027bda2ea5e5d"
+  "gitHead": "695265641dcf2243ab9f27b25776f11616225f68"
 }