fcmpush 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b7e2ec1bd92516fddfe4188ad164cc4f03e586d9de159fb52eb6f9318f99cb2
-  data.tar.gz: d31f5a82b26960cb115930eb080a1c40516541292227c3f43e5397c6ceb39382
+  metadata.gz: 5955f70af9ad3b06fbd33190d218cd115919476a8f3bd85b0f97d3d13ab94757
+  data.tar.gz: 5f267e161537e51aaeb44428de5fe024556cf865b2fb3178a2b5286418250ef8
 SHA512:
-  metadata.gz: 530207aada029ea8ef333957158eaa8c8ab147fdb6fe4a56cd707026ffe82f68eae6cee6701e3494be0bccbfb572fe61c481cc077bf2dd93c8da2f2b9ab453f3
-  data.tar.gz: bf0f2c5b86ac0221f038ba303d373c591ca4dcf08a9c51183ff5061f4b2513e79b149ea47e0093db3642d7ae11cfba529b7d6f4a2796fa03dc1d73edaf72b305
+  metadata.gz: 9577b9638e6d3968377e648fb407f7ec5624bf4446c6dc04b1831e4da9d82022d78c7e96fd8bd0729fdb955366fa53fbf88e641b11a2da4ac2f7931bad14d3d5
+  data.tar.gz: b4a36fdfc16a8d9c85fc35373db504a1861c96b0f3cdbffd5feebcce7542d5d4bf969408f25854262317555e753ad2bedf0aa019012555364be6976869309b7f

data/fcmpush.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6', '< 3.3'
+  spec.required_ruby_version = '>= 2.6', '< 3.4'
 
   spec.add_dependency 'google-apis-identitytoolkit_v3'
   spec.add_dependency 'net-http-persistent', '~> 4.0.1'

data/lib/fcmpush/client.rb

@@ -23,8 +23,22 @@ 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
+
+      if !configuration.proxy
+        # do nothing
+      elsif configuration.proxy == :ENV
+        @connection.proxy = :ENV
+      elsif configuration.proxy && configuration.proxy[:uri]
+        uri = URI(configuration.proxy[:uri])
+        # user name must not be a empty string, password can
+        if configuration.proxy[:user] && configuration.proxy[:user].strip != ''
+          uri.user = configuration.proxy[:user]
+          uri.password = configuration.proxy[:password] if configuration.proxy[:password]
+        end
+        @connection.proxy = uri
+      end
     end
 
     def v1_authorize
@@ -98,7 +112,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)
 
@@ -119,7 +136,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}")
@@ -127,7 +146,7 @@ module Fcmpush
 
       def exception_handler(response)
         error = STATUS_TO_EXCEPTION_MAPPING[response.code]
-        raise error.new("Receieved an error response #{response.code} #{error.to_s.split('::').last}: #{response.body}", response) if error
+        raise error.new("Received an error response #{response.code} #{error.to_s.split('::').last}: #{response.body}", response) if error
 
         response
       end

data/lib/fcmpush/configuration.rb

@@ -1,6 +1,6 @@
 module Fcmpush
   class Configuration
-    attr_accessor :scope, :json_key_io, :server_key
+    attr_accessor :scope, :json_key_io, :server_key, :proxy
 
     def initialize
       @scope = ['https://www.googleapis.com/auth/firebase.messaging']
@@ -15,7 +15,17 @@ 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
     end
   end
 end

data/lib/fcmpush/version.rb

@@ -1,3 +1,3 @@
 module Fcmpush
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcmpush
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - miyataka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-identitytoolkit_v3
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="