Add FCM push type and remove MPNS support due to its end of life

Author: jguz-pubnub

pubnub/enums.py

@@ -143,9 +143,9 @@ class PNReconnectionPolicy(object):
 
 class PNPushType(object):
     APNS = 1
-    MPNS = 2
-    GCM = 3
+    GCM = 3  # Deprecated: Use FCM instead. GCM has been replaced by FCM (Firebase Cloud Messaging)
     APNS2 = 4
+    FCM = 5
 
 
 class PNResourceType(object):

pubnub/utils.py

@@ -154,8 +154,8 @@ def push_type_to_string(push_type):
         return "apns"
     elif push_type == PNPushType.GCM:
         return "gcm"
-    elif push_type == PNPushType.MPNS:
-        return "mpns"
+    elif push_type == PNPushType.FCM:
+        return "fcm"
     else:
         return ""
 

tests/functional/push/test_add_channels_to_push.py

@@ -43,30 +43,30 @@ def test_push_add_single_channel(self):
         self.assertEqual(self.add_channels._channels, ['ch'])
 
     def test_push_add_multiple_channels(self):
-        self.add_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice")
+        self.add_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.APNS).device_id("coolDevice")
 
         params = (pnconf.subscribe_key, "coolDevice")
         self.assertEqual(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params)
 
         self.assertEqual(self.add_channels.build_params_callback()({}), {
             'pnsdk': sdk_name,
             'uuid': self.pubnub.uuid,
-            'type': 'mpns',
+            'type': 'apns',
             'add': 'ch1,ch2'
         })
 
         self.assertEqual(self.add_channels._channels, ['ch1', 'ch2'])
 
     def test_push_add_google(self):
-        self.add_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM).device_id("coolDevice")
+        self.add_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.FCM).device_id("coolDevice")
 
         params = (pnconf.subscribe_key, "coolDevice")
         self.assertEqual(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params)
 
         self.assertEqual(self.add_channels.build_params_callback()({}), {
             'pnsdk': sdk_name,
             'uuid': self.pubnub.uuid,
-            'type': 'gcm',
+            'type': 'fcm',
             'add': 'ch1,ch2,ch3'
         })
 

tests/functional/push/test_list_push_provisions.py

@@ -55,19 +55,6 @@ def test_list_channel_group_gcm(self):
             'type': 'gcm'
         })
 
-    def test_list_channel_group_mpns(self):
-        self.list_push.push_type(PNPushType.MPNS).device_id('coolDevice')
-
-        self.assertEqual(self.list_push.build_path(),
-                         ListPushProvisions.LIST_PATH % (
-                             pnconf.subscribe_key, "coolDevice"))
-
-        self.assertEqual(self.list_push.build_params_callback()({}), {
-            'pnsdk': sdk_name,
-            'uuid': self.pubnub.uuid,
-            'type': 'mpns'
-        })
-
     def test_list_channel_group_apns2(self):
         self.list_push.push_type(PNPushType.APNS2).device_id('coolDevice')\
             .environment(pubnub.enums.PNPushEnvironment.PRODUCTION).topic("testTopic")

tests/functional/push/test_remove_channels_from_push.py

@@ -36,22 +36,22 @@ def test_push_remove_single_channel(self):
         self.assertEqual(self.remove_channels._channels, ['ch'])
 
     def test_push_remove_multiple_channels(self):
-        self.remove_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice")
+        self.remove_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.APNS).device_id("coolDevice")
 
         params = (pnconf.subscribe_key, "coolDevice")
         self.assertEqual(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params)
 
         self.assertEqual(self.remove_channels.build_params_callback()({}), {
             'pnsdk': sdk_name,
             'uuid': self.pubnub.uuid,
-            'type': 'mpns',
+            'type': 'apns',
             'remove': 'ch1,ch2'
         })
 
         self.assertEqual(self.remove_channels._channels, ['ch1', 'ch2'])
 
     def test_push_remove_google(self):
-        self.remove_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM)\
+        self.remove_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.FCM)\
             .device_id("coolDevice")
 
         params = (pnconf.subscribe_key, "coolDevice")
@@ -60,7 +60,7 @@ def test_push_remove_google(self):
         self.assertEqual(self.remove_channels.build_params_callback()({}), {
             'pnsdk': sdk_name,
             'uuid': self.pubnub.uuid,
-            'type': 'gcm',
+            'type': 'fcm',
             'remove': 'ch1,ch2,ch3'
         })
 

tests/functional/push/test_remove_device_from_push.py

@@ -50,16 +50,16 @@ def test_remove_push_gcm(self):
             'type': 'gcm',
         })
 
-    def test_remove_push_mpns(self):
-        self.remove_device.push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice")
+    def test_remove_push_fcm(self):
+        self.remove_device.push_type(pubnub.enums.PNPushType.FCM).device_id("coolDevice")
 
         params = (pnconf.subscribe_key, "coolDevice")
         self.assertEqual(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params)
 
         self.assertEqual(self.remove_device.build_params_callback()({}), {
             'pnsdk': sdk_name,
             'uuid': self.pubnub.uuid,
-            'type': 'mpns',
+            'type': 'fcm',
         })
 
     def test_remove_push_apns2(self):

tests/integrational/fixtures/native_sync/list_push_channels/mpns_basic_success.json

@@ -82,25 +82,6 @@ def test_list_push_channels_apns2_basic_success(self):
         self.assertTrue(envelope.status.is_error() is False)
         self.assertIsInstance(envelope.result.channels, list)
 
-    @pn_vcr.use_cassette(
-        'tests/integrational/fixtures/native_sync/list_push_channels/mpns_basic_success.json',
-        serializer='pn_json',
-        filter_query_parameters=['seqn', 'pnsdk', 'l_sig']
-    )
-    def test_list_push_channels_mpns_basic_success(self):
-        """Test basic MPNS channel listing functionality."""
-        device_id = "0000000000000000"
-
-        envelope = self.pubnub.list_push_channels() \
-            .device_id(device_id) \
-            .push_type(PNPushType.MPNS) \
-            .sync()
-
-        self.assertIsNotNone(envelope)
-        self.assertIsNotNone(envelope.result)
-        self.assertTrue(envelope.status.is_error() is False)
-        self.assertIsInstance(envelope.result.channels, list)
-
     @pn_vcr.use_cassette(
         'tests/integrational/fixtures/native_sync/list_push_channels/empty_device.json',
         serializer='pn_json',