Merge branch 'firebase:main' into main

Author: Tanker187

etc/firebase-admin.messaging.api.md

@@ -8,6 +8,7 @@ import { Agent } from 'http';
 
 // @public
 export interface AndroidConfig {
+    bandwidthConstrainedOk?: boolean;
     collapseKey?: string;
     data?: {
         [key: string]: string;
@@ -17,6 +18,7 @@ export interface AndroidConfig {
     notification?: AndroidNotification;
     priority?: ('high' | 'normal');
     restrictedPackageName?: string;
+    restrictedSatelliteOk?: boolean;
     ttl?: number;
 }
 

package-lock.json

@@ -428,6 +428,18 @@ export interface AndroidConfig {
   * the app while the device is in direct boot mode.
   */
   directBootOk?: boolean;
+
+  /**
+   * A boolean indicating whether messages will be allowed to be delivered to  
+   * the app while the device is on a bandwidth constrained network.
+   */
+  bandwidthConstrainedOk?: boolean;
+
+  /**
+   * A boolean indicating whether messages will be allowed to be delivered to  
+   * the app while the device is on a restricted satellite network.
+   */
+  restrictedSatelliteOk?: boolean;
 }
 
 /**

src/messaging/messaging-api.ts

@@ -422,6 +422,8 @@ function validateAndroidConfig(config: AndroidConfig | undefined): void {
     collapseKey: 'collapse_key',
     restrictedPackageName: 'restricted_package_name',
     directBootOk: 'direct_boot_ok',
+    bandwidthConstrainedOk: 'bandwidth_constrained_ok',
+    restrictedSatelliteOk: 'restricted_satellite_ok',
   };
   renameProperties(config, propertyMappings);
 }

src/messaging/messaging-internal.ts

@@ -1899,6 +1899,8 @@ describe('Messaging', () => {
             collapseKey: 'test.key',
             restrictedPackageName: 'test.package',
             directBootOk: true,
+            bandwidthConstrainedOk: true,
+            restrictedSatelliteOk: true,
             notification: {
               clickAction: 'test.click.action',
               titleLocKey: 'title.loc.key',
@@ -1927,6 +1929,8 @@ describe('Messaging', () => {
             collapse_key: 'test.key',
             restricted_package_name: 'test.package',
             direct_boot_ok: true,
+            bandwidth_constrained_ok: true,
+            restricted_satellite_ok: true,
             notification: {
               click_action: 'test.click.action',
               title_loc_key: 'title.loc.key',
@@ -1983,6 +1987,8 @@ describe('Messaging', () => {
             collapseKey: 'test.key',
             restrictedPackageName: 'test.package',
             directBootOk: true,
+            bandwidthConstrainedOk: true,
+            restrictedSatelliteOk: true,
             ttl: 5,
             data: {
               k1: 'v1',
@@ -2031,6 +2037,8 @@ describe('Messaging', () => {
             collapse_key: 'test.key',
             restricted_package_name: 'test.package',
             direct_boot_ok: true,
+            bandwidth_constrained_ok: true,
+            restricted_satellite_ok: true,
             ttl: '0.005000000s', // 5 ms = 5,000,000 ns
             data: {
               k1: 'v1',