rpush 7.0.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409c28bf9f63343232e1c7db56f8d7131acc70b4828032059f37eab3a4606e6c
-  data.tar.gz: 3f07d7e79828fa43ab5ed73a9b19183a9f4ac9e5a3d8891f1ecfec42c7375c03
+  metadata.gz: e4ab9013682357312b9f5050d6c466c62866f78c68cc0fcb72ad89ccdc4409e0
+  data.tar.gz: ab086d28a744140499a6434c5fcec99b6c77c4cd929163a02ac4d9d77f94bb99
 SHA512:
-  metadata.gz: 400a7241c337ff9874767be4ee051d1494676665bd17e9b3acb2e3ce8efae236971a138888da6c0172e0c649276e97f4d639430733bad345e7980d408e8c3436
-  data.tar.gz: e81b66da807a2bc8a386a12825aed37c452672be899b69ff633d65b80548903669e7d63b3b1eec899633557a489157e8083ed562b2665c017566df9ad220c151
+  metadata.gz: 862a057ab8cce2f73eff784838302ac0128214e0f744ed108b91afb33dce0867f7e7f06e131a29b46f6f49be7cca4e809f317ed37c50d1512eaa480a8ad7532d
+  data.tar.gz: 2f2d5cd377c79a1ec1ada2677f5c409d58d27d40a90b899b7fd43b98f122148623a0a78ca17c862b18b38245fe2df9a2f1cc7c68f25dc8cbe3dfa48a1f779c1f

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [Unreleased](https://github.com/rpush/rpush/tree/HEAD)
+
+**Merged pull requests:**
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v9.0.0...HEAD)
+
+## [v9.0.0](https://github.com/rpush/rpush/tree/v9.0.0) (2024-09-09)
+
+**Merged pull requests:**
+
+* Support for Ruby 3.2 & 3.3 [\#679](https://github.com/rpush/rpush/pull/679) ([benlangfeld](https://github.com/benlangfeld))
+
+**Breaking:**
+
+* Removed legacy APNSv1 implementation (Apple binary protocol) since this was shut down in 2021. [\#680](https://github.com/rpush/rpush/pull/680) ([benlangfeld](https://github.com/benlangfeld))
+* Removed legacy GCM implementation since this was shut down by Google in August 2024 and replaced by FCM (supported in RPush 8.0.0) [\#688](https://github.com/rpush/rpush/pull/688) ([benlangfeld](https://github.com/benlangfeld))
+* Drop support for Ruby 2.x [\#672](https://github.com/rpush/rpush/pull/672) ([benlangfeld](https://github.com/benlangfeld))
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v8.0.0...v9.0.0)
+
+## [v8.0.0](https://github.com/rpush/rpush/tree/v8.0.0) (2024-09-06)
+
+**Merged pull requests:**
+
+* Support for FCMv1 [\#620](https://github.com/rpush/rpush/pull/620) ([mirkode](https://github.com/mirkode)), [\#660](https://github.com/rpush/rpush/pull/660) ([AnilRh](https://github.com/AnilRh)) and [\#673](https://github.com/rpush/rpush/pull/673) ([SixiS](https://github.com/SixiS), [Henridv](https://github.com/Henridv) & [benlangfeld](https://github.com/benlangfeld))
+* No longer silence content-available notifications for APNs. Reverts the following change from the v6.0.0 release. See https://github.com/rpush/rpush/issues/647.
+  * Fix silent APNS notifications for Apns2 and Apnsp8 [\#596](https://github.com/rpush/rpush/pull/596) ([shved270189](https://github.com/shved270189))
+
+**Breaking:**
+
+* Dropped support for Ruby 2.4, 2.5, 2.6 and Rails 5.2.
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.1...v8.0.0)
+
 ## [v7.0.1](https://github.com/rpush/rpush/tree/v7.0.1) (2022-03-02)
 
 [Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...v7.0.1)
@@ -8,10 +42,6 @@
 
 - Fix deprecation warnings from the redis gem [\#636](https://github.com/rpush/rpush/pull/636) ([sharang-d](https://github.com/sharang-d))
 
-## [Unreleased](https://github.com/rpush/rpush/tree/HEAD)
-
-[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...HEAD)
-
 ## [v7.0.0](https://github.com/rpush/rpush/tree/HEAD)
 
 [Full Changelog](https://github.com/rpush/rpush/compare/v6.0.1...v7.0.0)

data/README.md

@@ -57,10 +57,9 @@ There is a choice of two modes (and one legacy mode) using certificates or using
 
 * `Rpush::Apns2` This requires an annually renewable certificate. see https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_certificate-based_connection_to_apns
 * `Rpush::Apnsp8` This uses encrypted tokens and requires an encryption key id and encryption key (provide as a p8 file). (see https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_token-based_connection_to_apns)
-* `Rpush::Apns` There is also the original APNS (the original version using certificates with a binary underlying protocol over TCP directly rather than over Http/2).
   Apple have [announced](https://developer.apple.com/news/?id=c88acm2b) that this is not supported after March 31, 2021.
 
-If this is your first time using the APNs, you will need to generate either SSL certificates (for Apns2 or Apns) or an Encryption Key (p8) and an Encryption Key ID (for Apnsp8). See [Generating Certificates](https://github.com/rpush/rpush/wiki/Generating-Certificates) for instructions.
+If this is your first time using the APNs, you will need to generate either SSL certificates (for standard Apns) or an Encryption Key (p8) and an Encryption Key ID (for Apnsp8). See [Generating Certificates](https://github.com/rpush/rpush/wiki/Generating-Certificates) for instructions.
 
 ##### Apnsp8
 
@@ -83,6 +82,7 @@ n = Rpush::Apnsp8::Notification.new
 n.app = Rpush::Apnsp8::App.find_by_name("ios_app")
 n.device_token = "..." # hex string
 n.alert = "hi mom!"
+# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" }
 n.data = { foo: :bar }
 n.save!
 ```
@@ -107,6 +107,7 @@ n = Rpush::Apns2::Notification.new
 n.app = Rpush::Apns2::App.find_by_name("ios_app")
 n.device_token = "..." # hex string
 n.alert = "hi mom!"
+# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" }
 n.data = {
   headers: { 'apns-topic': "BUNDLE ID" }, # the bundle id of the app, like com.example.appname. Not necessary if set on the app (see above)
   foo: :bar
@@ -116,61 +117,41 @@ n.save!
 
 You should also implement the [ssl_certificate_will_expire](https://github.com/rpush/rpush/wiki/Reflection-API) reflection to monitor when your certificate is due to expire.
 
-##### Apns (legacy protocol)
-
-```ruby
-app = Rpush::Apns::App.new
-app.name = "ios_app"
-app.certificate = File.read("/path/to/sandbox.pem")
-app.environment = "development" # APNs environment.
-app.password = "certificate password"
-app.connections = 1
-app.save!
-```
-
-```ruby
-n = Rpush::Apns::Notification.new
-n.app = Rpush::Apns::App.find_by_name("ios_app")
-n.device_token = "..." # hex string
-n.alert = "hi mom!"
-n.data = { foo: :bar }
-n.save!
-```
-
 ##### Safari Push Notifications
 
 Using one of the notifications methods above, the `url_args` attribute is available for Safari Push Notifications.
 
 ##### Environment
 
-The app `environment` for any Apns* option is "development" for XCode installs, and "production" for app store and TestFlight. Note that for Apns2 you can now use one (production + sandbox) certificate (you don't need a separate "sandbox" or development certificate), but if you do generate a development/sandbox certificate it can only be used for "development". With Apnsp8 tokens, you can target either "development" or "production" environments.
+The app `environment` for any Apns* option is "development" for XCode installs, and "production" for app store and TestFlight. Note that you can now use one (production + sandbox) certificate (you don't need a separate "sandbox" or development certificate), but if you do generate a development/sandbox certificate it can only be used for "development". With Apnsp8 tokens, you can target either "development" or "production" environments.
 
 #### Firebase Cloud Messaging
 
-FCM and GCM are – as of writing – compatible with each other. See also [this comment](https://github.com/rpush/rpush/issues/284#issuecomment-228330206) for further references.
+You will need two params to make use of FCM via Rpush.
+- `firebase_project_id` - The `Project ID` in your Firebase Project Settings
+- `json_key` - The JSON key file for a service account with the `Firebase Admin SDK Administrator Service Agent` role.
+
+Create service account in the google cloud account attached to your firebase account:
+https://console.cloud.google.com/iam-admin/serviceaccounts
+Make sure it has Role `Firebase Admin SDK Administrator Service Agent`
+Add + Download the json key for the service account.
 
-Please refer to the Firebase Console on where to find your `auth_key` (probably called _Server Key_ there). To verify you have the right key, use tools like [Postman](https://www.getpostman.com/), [HTTPie](https://httpie.org/), `curl` or similar before reporting a new issue. See also [this comment](https://github.com/rpush/rpush/issues/346#issuecomment-289218776).
+Once you have those two params, you can create an FCM app and send notifications.
 
 ```ruby
-app = Rpush::Gcm::App.new
-app.name = "android_app"
-app.auth_key = "..."
-app.connections = 1
-app.save!
+fcm_app = Rpush::Fcm::App.new
+fcm_app.name = "fcm_app"
+fcm_app.firebase_project_id = "someapp-123456"
+fcm_app.json_key = Rails.root.join("your/key/somewhere.json").read # or from a ENV variable - just needs to be the whole json file
+fcm_app.connections = 30
+fcm_app.save!
 ```
 
 ```ruby
-n = Rpush::Gcm::Notification.new
-n.app = Rpush::Gcm::App.find_by_name("android_app")
-n.registration_ids = ["..."]
-n.data = { message: "hi mom!" }
-n.priority = 'high'        # Optional, can be either 'normal' or 'high'
-n.content_available = true # Optional
-# Optional notification payload. See the reference below for more keys you can use!
-n.notification = { body: 'great match!',
-                   title: 'Portugal vs. Denmark',
-                   icon: 'myicon'
-                 }
+n = Rpush::Fcm::Notification.new
+n.app = Rpush::Fcm::App.where(name: "fcm_app").first
+n.device_token = device_token # Note that device_token is used here instead of registration_ids
+n.data = {}.transform_values(&:to_s) # All values going in here have to be strings, if you have anything else - nothing goes through
 n.save!
 ```
 
@@ -374,7 +355,6 @@ Rpush will deliver all pending notifications and then exit.
 
 ```ruby
 Rpush.push
-Rpush.apns_feedback
 ```
 
 See [Push API](https://github.com/rpush/rpush/wiki/Push-API) for more details.
@@ -470,7 +450,7 @@ This will run RSpec against all versions of Rails.
 You need to specify a `BUNDLE_GEMFILE` pointing to the gemfile before running the normal test command:
 
 ```
-BUNDLE_GEMFILE=gemfiles/rails_5.2.gemfile rspec spec/unit/apns_feedback_spec.rb
+BUNDLE_GEMFILE=gemfiles/rails_6.0.gemfile rspec spec/unit/apns_feedback_spec.rb
 ```
 
 ##### Multiple database adapter support

data/lib/generators/rpush_migration_generator.rb

@@ -53,6 +53,7 @@ class RpushMigrationGenerator < Rails::Generators::Base
     add_rpush_migration('rpush_4_1_0_updates')
     add_rpush_migration('rpush_4_1_1_updates')
     add_rpush_migration('rpush_4_2_0_updates')
+    add_rpush_migration('rpush_7_1_0_updates')
   end
 
   protected

data/lib/generators/templates/rpush.rb

@@ -30,9 +30,6 @@ Rpush.configure do |config|
   # If the logger goes to stdout, you can disable foreground logging to avoid duplication.
   # config.foreground_logging = false
 
-  # config.apns.feedback_receiver.enabled = true
-  # config.apns.feedback_receiver.frequency = 60
-
 end
 
 Rpush.reflect do |on|
@@ -76,30 +73,43 @@ Rpush.reflect do |on|
   # on.notification_id_will_retry do |app, notification_id, retry_after|
   # end
 
-  # Called when a TCP connection is lost and will be reconnected.
-  # on.tcp_connection_lost do |app, error|
+  # Called for each recipient which successfully receives a notification. This
+  # can occur more than once for the same notification when there are multiple
+  # recipients.
+  # on.fcm_delivered_to_recipient do |notification|
+  # end
+
+  # Called for each recipient which fails to receive a notification. This
+  # can occur more than once for the same notification when there are multiple
+  # recipients. (do not handle invalid device tokens here)
+  # on.fcm_failed_to_recipient do |notification, error|
+  # end
+
+  # Called when the FCM returns a failure that indicates an invalid device token.
+  # You will need to delete the device token from your records.
+  # on.fcm_invalid_device_token do |app, error, device_token|
   # end
 
   # Called for each recipient which successfully receives a notification. This
   # can occur more than once for the same notification when there are multiple
   # recipients.
-  # on.gcm_delivered_to_recipient do |notification, registration_id|
+  # on.fcm_delivered_to_recipient do |notification, device_token|
   # end
 
   # Called for each recipient which fails to receive a notification. This
   # can occur more than once for the same notification when there are multiple
-  # recipients. (do not handle invalid registration IDs here)
-  # on.gcm_failed_to_recipient do |notification, error, registration_id|
+  # recipients. (do not handle invalid device tokens here)
+  # on.fcm_failed_to_recipient do |notification, error, device_token|
   # end
 
-  # Called when the GCM returns a canonical registration ID.
+  # Called when the FCM returns a canonical device token.
   # You will need to replace old_id with canonical_id in your records.
-  # on.gcm_canonical_id do |old_id, canonical_id|
+  # on.fcm_canonical_id do |old_id, canonical_id|
   # end
 
-  # Called when the GCM returns a failure that indicates an invalid registration id.
-  # You will need to delete the registration_id from your records.
-  # on.gcm_invalid_registration_id do |app, error, registration_id|
+  # Called when the FCM returns a failure that indicates an invalid device token.
+  # You will need to delete the device_token from your records.
+  # on.fcm_invalid_device_token do |app, error, device_token|
   # end
 
   # Called when an SSL certificate will expire within 1 month.

data/lib/generators/templates/rpush_7_1_0_updates.rb

@@ -0,0 +1,12 @@
+class Rpush710Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
+  def self.up
+    add_column :rpush_apps, :firebase_project_id, :string
+    add_column :rpush_apps, :json_key, :text
+  end
+
+  def self.down
+    remove_column :rpush_apps, :firebase_project_id
+    remove_column :rpush_apps, :json_key
+  end
+end
+

data/lib/rpush/client/active_model/apns/notification.rb

@@ -52,10 +52,6 @@ module Rpush
             self.data = (data || {}).merge(CONTENT_AVAILABLE_KEY => true)
           end
 
-          def content_available?
-            (self.data || {})[CONTENT_AVAILABLE_KEY]
-          end
-
           def as_json(options = nil) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
             json = ActiveSupport::OrderedHash.new
 

data/lib/rpush/client/active_model/{gcm → fcm}/app.rb

@@ -1,16 +1,17 @@
 module Rpush
   module Client
     module ActiveModel
-      module Gcm
+      module Fcm
         module App
           def self.included(base)
             base.instance_eval do
-              validates :auth_key, presence: true
+              # TODO: Add whatever validation is needed here
+              # validates :auth_key, presence: true
             end
           end
 
           def service_name
-            'gcm'
+            'fcm'
           end
         end
       end

data/lib/rpush/client/active_model/{gcm → fcm}/expiry_collapse_key_mutual_inclusion_validator.rb

@@ -1,7 +1,7 @@
 module Rpush
   module Client
     module ActiveModel
-      module Gcm
+      module Fcm
         class ExpiryCollapseKeyMutualInclusionValidator < ::ActiveModel::Validator
           def validate(record)
             return unless record.collapse_key && !record.expiry

data/lib/rpush/client/active_model/fcm/notification.rb

@@ -0,0 +1,129 @@
+module Rpush
+  module Client
+    module ActiveModel
+      module Fcm
+        module Notification
+          FCM_PRIORITY_HIGH = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_IMMEDIATE
+          FCM_PRIORITY_NORMAL = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_CONSERVE_POWER
+          FCM_PRIORITIES = [FCM_PRIORITY_HIGH, FCM_PRIORITY_NORMAL]
+
+          ROOT_NOTIFICATION_KEYS = %w[title body image].freeze
+          ANDROID_NOTIFICATION_KEYS = %w[icon tag color click_action body_loc_key body_loc_args title_loc_key
+                                         title_loc_args channel_id ticker sticky event_time local_only
+                                         default_vibrate_timings default_light_settings vibrate_timings
+                                         visibility notification_count light_settings].freeze
+
+          def self.included(base)
+            base.instance_eval do
+              validates :device_token, presence: true
+              validates :priority, inclusion: { in: FCM_PRIORITIES }, allow_nil: true
+
+              validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator, limit: 4096
+              validates_with Rpush::Client::ActiveModel::RegistrationIdsCountValidator, limit: 1000
+
+              validates_with Rpush::Client::ActiveModel::Fcm::ExpiryCollapseKeyMutualInclusionValidator
+              validates_with Rpush::Client::ActiveModel::Fcm::NotificationKeysInAllowedListValidator
+            end
+          end
+
+          def payload_data_size
+            multi_json_dump(as_json['message']['data']).bytesize
+          end
+
+          # This is a hack. The schema defines `priority` to be an integer, but FCM expects a string.
+          # But for users of rpush to have an API they might expect (setting priority to `high`, not 10)
+          # we do a little conversion here.
+          def priority=(priority)
+            case priority
+              when 'high', FCM_PRIORITY_HIGH
+                super(FCM_PRIORITY_HIGH)
+              when 'normal', FCM_PRIORITY_NORMAL
+                super(FCM_PRIORITY_NORMAL)
+              else
+                errors.add(:priority, 'must be one of either "normal" or "high"')
+            end
+          end
+
+          def dry_run=(value)
+            fail ArgumentError, 'FCM does not support dry run' if value
+          end
+
+          def as_json(options = nil) # rubocop:disable Metrics/PerceivedComplexity
+            json = {
+              'data' => data,
+              'android' => android_config,
+              'apns' => apns_config,
+              'token' => device_token
+            }
+
+            json['notification'] = root_notification if notification
+            { 'message' => json }
+          end
+
+          def android_config
+            json = ActiveSupport::OrderedHash.new
+            json['notification'] = android_notification if notification
+            json['collapse_key'] = collapse_key if collapse_key
+            json['priority'] = priority_str if priority
+            json['ttl'] = "#{expiry}s" if expiry
+            json
+          end
+
+          def apns_config
+            json = ActiveSupport::OrderedHash.new
+            json['payload'] = ActiveSupport::OrderedHash.new
+
+            aps = ActiveSupport::OrderedHash.new
+            aps['mutable-content'] = 1 if mutable_content
+            aps['content-available'] = 1 if content_available
+            aps['sound'] = 'default' if sound == 'default'
+
+            json['payload']['aps'] = aps
+
+            json
+          end
+
+          def notification=(value)
+            value = value.with_indifferent_access if value.is_a?(Hash)
+            super(value)
+          end
+
+          def root_notification
+            return {} unless notification
+
+            notification.slice(*ROOT_NOTIFICATION_KEYS)
+          end
+
+          def android_notification
+            json = notification&.slice(*ANDROID_NOTIFICATION_KEYS) || {}
+            json['notification_priority'] = priority_for_notification if priority
+            json['sound'] = sound if sound
+            json['default_sound'] = sound == 'default' ? true : false
+            json
+          end
+
+          def priority_str
+            case
+            when priority <= 5 then 'normal'
+            else
+              'high'
+            end
+          end
+
+          def priority_for_notification
+            case priority
+            when 0 then 'PRIORITY_UNSPECIFIED'
+            when 1 then 'PRIORITY_MIN'
+            when 2 then 'PRIORITY_LOW'
+            when 5 then 'PRIORITY_DEFAULT'
+            when 6 then 'PRIORITY_HIGH'
+            when 10 then 'PRIORITY_MAX'
+            else
+              'PRIORITY_DEFAULT'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_model/fcm/notification_keys_in_allowed_list_validator.rb

@@ -0,0 +1,20 @@
+module Rpush
+  module Client
+    module ActiveModel
+      module Fcm
+        class NotificationKeysInAllowedListValidator < ::ActiveModel::Validator
+          def validate(record)
+            return unless record.notification
+
+            allowed_keys = Notification::ROOT_NOTIFICATION_KEYS + Notification::ANDROID_NOTIFICATION_KEYS
+            invalid_keys = record.notification.keys - allowed_keys
+
+            return if invalid_keys.empty?
+
+            record.errors.add(:notification, "contains invalid keys: #{invalid_keys.join(', ')}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_model.rb

@@ -20,9 +20,10 @@ require 'rpush/client/active_model/adm/data_validator'
 require 'rpush/client/active_model/adm/app'
 require 'rpush/client/active_model/adm/notification'
 
-require 'rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator'
-require 'rpush/client/active_model/gcm/app'
-require 'rpush/client/active_model/gcm/notification'
+require 'rpush/client/active_model/fcm/expiry_collapse_key_mutual_inclusion_validator'
+require 'rpush/client/active_model/fcm/notification_keys_in_allowed_list_validator'
+require 'rpush/client/active_model/fcm/app'
+require 'rpush/client/active_model/fcm/notification'
 
 require 'rpush/client/active_model/wpns/app'
 require 'rpush/client/active_model/wpns/notification'

data/lib/rpush/client/active_record/{gcm → fcm}/app.rb

@@ -1,9 +1,9 @@
 module Rpush
   module Client
     module ActiveRecord
-      module Gcm
+      module Fcm
         class App < Rpush::Client::ActiveRecord::App
-          include Rpush::Client::ActiveModel::Gcm::App
+          include Rpush::Client::ActiveModel::Fcm::App
         end
       end
     end

data/lib/rpush/client/active_record/{gcm → fcm}/notification.rb

@@ -1,9 +1,9 @@
 module Rpush
   module Client
     module ActiveRecord
-      module Gcm
+      module Fcm
         class Notification < Rpush::Client::ActiveRecord::Notification
-          include Rpush::Client::ActiveModel::Gcm::Notification
+          include Rpush::Client::ActiveModel::Fcm::Notification
         end
       end
     end

data/lib/rpush/client/active_record.rb

@@ -16,8 +16,8 @@ require 'rpush/client/active_record/apns2/app'
 require 'rpush/client/active_record/apnsp8/notification'
 require 'rpush/client/active_record/apnsp8/app'
 
-require 'rpush/client/active_record/gcm/notification'
-require 'rpush/client/active_record/gcm/app'
+require 'rpush/client/active_record/fcm/notification'
+require 'rpush/client/active_record/fcm/app'
 
 require 'rpush/client/active_record/wpns/notification'
 require 'rpush/client/active_record/wpns/app'

data/lib/rpush/client/redis/app.rb

@@ -19,6 +19,8 @@ module Rpush
         attribute :team_id, :string
         attribute :bundle_id, :string
         attribute :feedback_enabled, :boolean, default: true
+        attribute :firebase_project_id, :string
+        attribute :json_key, :string
 
         index :name
 

data/lib/rpush/client/redis/{gcm → fcm}/app.rb

@@ -1,9 +1,9 @@
 module Rpush
   module Client
     module Redis
-      module Gcm
+      module Fcm
         class App < Rpush::Client::Redis::App
-          include Rpush::Client::ActiveModel::Gcm::App
+          include Rpush::Client::ActiveModel::Fcm::App
         end
       end
     end

data/lib/rpush/client/redis/{gcm → fcm}/notification.rb

@@ -1,9 +1,9 @@
 module Rpush
   module Client
     module Redis
-      module Gcm
+      module Fcm
         class Notification < Rpush::Client::Redis::Notification
-          include Rpush::Client::ActiveModel::Gcm::Notification
+          include Rpush::Client::ActiveModel::Fcm::Notification
         end
       end
     end

data/lib/rpush/client/redis.rb

@@ -27,8 +27,8 @@ require 'rpush/client/redis/apns2/notification'
 require 'rpush/client/redis/apnsp8/app'
 require 'rpush/client/redis/apnsp8/notification'
 
-require 'rpush/client/redis/gcm/app'
-require 'rpush/client/redis/gcm/notification'
+require 'rpush/client/redis/fcm/app'
+require 'rpush/client/redis/fcm/notification'
 
 require 'rpush/client/redis/adm/app'
 require 'rpush/client/redis/adm/notification'

data/lib/rpush/configuration.rb

@@ -16,27 +16,12 @@ module Rpush
     end
   end
 
-  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :foreground_logging, :log_level, :plugin, :apns]
+  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :foreground_logging, :log_level, :plugin]
   DEPRECATED_ATTRS = []
   CONFIG_ATTRS = CURRENT_ATTRS + DEPRECATED_ATTRS
 
   class ConfigurationError < StandardError; end
 
-  class ApnsFeedbackReceiverConfiguration < Struct.new(:frequency, :enabled) # rubocop:disable Style/StructInheritance
-    def initialize
-      super
-      self.enabled = true
-      self.frequency = 60
-    end
-  end
-
-  class ApnsConfiguration < Struct.new(:feedback_receiver) # rubocop:disable Style/StructInheritance
-    def initialize
-      super
-      self.feedback_receiver = ApnsFeedbackReceiverConfiguration.new
-    end
-  end
-
   class Configuration < Struct.new(*CONFIG_ATTRS) # rubocop:disable Style/StructInheritance
     include Deprecatable
 
@@ -55,8 +40,6 @@ module Rpush
       self.foreground = false
       self.foreground_logging = true
 
-      self.apns = ApnsConfiguration.new
-
       # Internal options.
       self.embedded = false
       self.push = false
@@ -106,7 +89,7 @@ module Rpush
       client_module = Rpush::Client.const_get(client.to_s.camelize)
       Rpush.send(:include, client_module) unless Rpush.ancestors.include?(client_module)
 
-      [:Apns, :Gcm, :Wpns, :Wns, :Adm, :Pushy, :Webpush].each do |service|
+      [:Apns, :Fcm, :Wpns, :Wns, :Adm, :Pushy, :Webpush].each do |service|
         Rpush.const_set(service, client_module.const_get(service)) unless Rpush.const_defined?(service)
       end
 

data/lib/rpush/daemon/apns2/delivery.rb

@@ -112,7 +112,6 @@ module Rpush
           headers['apns-expiration'] = '0'
           headers['apns-priority'] = '10'
           headers['apns-topic'] = @app.bundle_id
-          headers['apns-push-type'] = 'background' if notification.content_available?
 
           headers.merge notification_data(notification)[HTTP2_HEADERS_KEY] || {}
         end

data/lib/rpush/daemon/apnsp8/delivery.rb

@@ -149,7 +149,6 @@ module Rpush
           headers['apns-priority'] = '10'
           headers['apns-topic'] = @app.bundle_id
           headers['authorization'] = "bearer #{jwt_token}"
-          headers['apns-push-type'] = 'background' if notification.content_available?
 
           headers.merge notification_data(notification)[HTTP2_HEADERS_KEY] || {}
         end