fcmpush 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d98bbee5a1f8daeb92bc80eb99e47900fbdb1dd1b02f94ccf336438acca4309
-  data.tar.gz: e0c867579f0b8a9f36bdb1072eac2260c402ca1bb9a7651f991c039d453d6f90
+  metadata.gz: dbef0d4424feeec5ee1cf9b8a2cf1a09905bf38b6cdeee81258d54743cf482e3
+  data.tar.gz: 7e5b83733bf0a835a726d86eddb4c7620d57d0fc83b325b0ad5fa9c198a9152f
 SHA512:
-  metadata.gz: 6955bdd01edff13812527e4c3b0e559d8fbf50d264ef27ac9f7bfb86cf9aa7b37e99ab05f6a7d3e4086c0a8ae13a91bd0198ac44d3ce4d2f3d1dcc6b38c56e64
-  data.tar.gz: 0ad35b0fcf345715f4a6bc307a14f087961315803c0916e0032115cde3b8c3659fe18c108e22d822e2b4be9dbee41e6f9d1cd8a8804f76b370e6682881a2f4cf
+  metadata.gz: b00c885a01a3e27e3bb605debe64ad9a5e12bb2908baad3a8327c8d63dd9e2099dba3bc4e35e3804b0795b3f984a796c026ec3f2c22ee653508f3b6ca749f0b6
+  data.tar.gz: be3b0ae624b2d2dbbea1cfcd8ae42f44aa8cab254bc0ebbb1df8f65ccbefa3e5116e58cac67065064514a9a65b6e0d18f68732f9082a54e989710a6199b8b7b9

data/lib/fcmpush/client.rb

@@ -23,9 +23,12 @@ module Fcmpush
       access_token_response = v1_authorize
       @access_token = access_token_response['access_token']
       @access_token_expiry = Time.now.utc + access_token_response['expires_in']
-      @server_key = configuration.server_key
+      # @server_key = configuration.server_key
       @connection = Net::HTTP::Persistent.new
 
+      @connection.open_timeout = configuration.open_timeout if configuration.open_timeout
+      @connection.read_timeout = configuration.read_timeout if configuration.read_timeout
+
       if !configuration.proxy
         # do nothing
       elsif configuration.proxy == :ENV
@@ -112,7 +115,10 @@ module Fcmpush
         uri = URI.join(TOPIC_DOMAIN, TOPIC_ENDPOINT_PREFIX + suffix)
         uri.query = URI.encode_www_form(query) unless query.empty?
 
-        headers = legacy_authorized_header(headers)
+        headers = v1_authorized_header(headers)
+        # cf. https://takanamito.hateblo.jp/entry/2020/07/04/175045
+        # cf. https://github.com/miyataka/fcmpush/issues/40
+        headers['access_token_auth'] = 'true'
         post = Net::HTTP::Post.new(uri, headers)
         post.body = make_subscription_body(topic, *instance_ids)
 
@@ -133,7 +139,9 @@ module Fcmpush
                       'Authorization' => "Bearer #{access_token}")
       end
 
+      # @deprecated TODO: remove this method next version
       def legacy_authorized_header(headers)
+        warn "[DEPRECATION] `legacy_authorized_header` is deprecated.  Please use `v1_authorized_header` instead."
         headers.merge('Content-Type' => 'application/json',
                       'Accept' => 'application/json',
                       'Authorization' => "Bearer #{server_key}")

data/lib/fcmpush/configuration.rb

@@ -1,6 +1,6 @@
 module Fcmpush
   class Configuration
-    attr_accessor :scope, :json_key_io, :server_key, :proxy
+    attr_accessor :scope, :json_key_io, :server_key, :proxy, :open_timeout, :read_timeout
 
     def initialize
       @scope = ['https://www.googleapis.com/auth/firebase.messaging']
@@ -15,13 +15,21 @@ module Fcmpush
       # ENV['GOOGLE_PRIVATE_KEY'] = '-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n'
 
       # regacy auth
+      # @deprecated TODO: remove this next version
       @server_key = ENV['FCM_SERVER_KEY']
+      if @server_key
+        warn '[DEPRECATION] `FCM_SERVER_KEY` environment variable, also @server_key is deprecated. This attribute will be removed next version.'
+      end
 
       # THIS IS EXPERIMENTAL
       # NOT support `HTTPS_PROXY` environment variable. This feature not tested well on CI.
       # cf. https://github.com/miyataka/fcmpush/pull/39#issuecomment-1722533622
       # proxy
       @proxy = :ENV
+
+      # connection timeouts
+      @open_timeout = nil
+      @read_timeout = nil
     end
   end
 end

data/lib/fcmpush/version.rb

@@ -1,3 +1,3 @@
 module Fcmpush
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcmpush
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - miyataka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-identitytoolkit_v3