rhoconnect 6.2.0 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 867ce0e17fb3e61305afe8736a2f06d913abb0b2
-  data.tar.gz: 20f31ff7fefe36ae3fd1020ef541fa77062f6583
+SHA256:
+  metadata.gz: 83766b251f604a4cd12879f43b25f2c362a02c024854c1939b4308fc910c9407
+  data.tar.gz: ab266ed612312bc3d41c96d6f528a2497426b3ee81fd7ce6f4aa087385fabb00
 SHA512:
-  metadata.gz: a96a0176b31ca6e2539b18b4cd82235077817ed20a7bedd809878a851cb584fd08747fda22fffcb41d5226f16dbeb8aacca80e10825ad270a6d891277dcbd361
-  data.tar.gz: a425f98cb21806eaf9058bb44f378173c2daed1f2204d1ec0b9d1f1a1dc1de51bca308478b2d84d0354290e6530454e2a89b0f8feed38b948821894c695e590d
+  metadata.gz: 60645c4807398d6e817a47d5d22a76c1280080cfc68920ddea55bc788e986d386ddd5a8e1affeec29de64a2df8295c5afd471560e50dacc48edda684cf49e683
+  data.tar.gz: f8b55854160a7efaf803209cf2e796323189613e0d377de39dede5041fc9c46f5bb41e89c213d5bbec240b48e4ecaef74d1aabf49321c2f9cbdbd7914bc3b244

data/Gemfile

@@ -29,7 +29,7 @@ group :development do
   # gem 'debugger'
   gem 'aws-s3', '>= 0.6.3', :require => 'aws/s3'
   gem 'sqlite3', ">= 1.4.0", :platforms => [:ruby, :mswin, :mingw]
-  gem "excon", "~> 0.62.0"
+  gem "excon", "~> 0.72.0"
   gem "net-ssh", "~> 5.2.0"
   gem "fog-aws", "~> 3.4.0"
   gem 'ffaker', '~> 2.10.0'
@@ -48,3 +48,7 @@ end
 group :build do
   gem 'fpm', '>= 1.11.00'
 end
+
+gem 'signet', '~> 0.7'
+gem 'google-api-client', '~> 0.31.0'
+gem 'google-api-fcm', '~> 0.1.7'

data/Gemfile.lock

@@ -8,32 +8,36 @@ GIT
 PATH
   remote: .
   specs:
-    rhoconnect (7.0.0)
+    rhoconnect (7.1.0)
       bundler (~> 1.17.3)
       connection_pool (~> 2.2.2)
+      google-api-client (~> 0.31.0)
+      google-api-fcm (~> 0.1.7)
       json (>= 1.8, < 2.0)
       rack (~> 2.0.6)
       rake (~> 12.3.2)
       redis (~> 4.1.0)
+      redis-namespace (~> 1.6.0)
       resque (>= 2.0.0)
       rest-client (~> 2.0.2)
-      rubyzip (~> 1.2.2)
+      rubyzip (>= 1.2.2, < 2.1.0)
+      signet (~> 0.11.0)
       sinatra (~> 2.0.5)
       thor (~> 0.20.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arr-pm (0.0.10)
       cabin (> 0)
     aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
-    backports (3.13.0)
-    builder (3.2.3)
+    backports (3.16.1)
+    builder (3.2.4)
     cabin (0.9.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -42,23 +46,27 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     daemons (1.3.1)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     diff-lcs (1.3)
-    docile (1.3.1)
-    domain_name (0.5.20180417)
+    docile (1.3.2)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.2)
+    dotenv (2.7.5)
     eventmachine (1.0.9.1)
-    excon (0.62.0)
+    excon (0.72.0)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
     ffaker (2.10.0)
-    ffi (1.10.0)
+    ffi (1.12.2)
     fog-aws (3.4.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.1.2)
+    fog-core (2.2.0)
       builder
-      excon (~> 0.58)
+      excon (~> 0.71)
       formatador (~> 0.2)
       mime-types
     fog-json (1.2.0)
@@ -79,25 +87,49 @@ GEM
       pleaserun (~> 0.0.29)
       ruby-xz (~> 0.2.3)
       stud
-    hashdiff (0.3.8)
+    google-api-client (0.31.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.10.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.10)
+    google-api-fcm (0.1.7)
+      google-api-client (~> 0.17)
+    googleauth (0.9.0)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
+    hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    httpclient (2.8.3)
     insist (1.0.0)
-    io-like (0.3.0)
+    io-like (0.3.1)
     ipaddress (0.8.3)
     json (1.8.6)
-    mime-types (3.2.2)
+    jwt (2.2.1)
+    memoist (0.16.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.1009)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mono_logger (1.1.0)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
     mustache (0.99.8)
-    mustermann (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     net-ssh (5.2.0)
     netrc (0.11.0)
-    nokogiri (1.10.2)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
+    os (1.0.1)
     pleaserun (0.0.30)
       cabin (> 0)
       clamp
@@ -105,17 +137,21 @@ GEM
       insist
       mustache (= 0.99.8)
       stud
-    public_suffix (3.0.3)
-    rack (2.0.7)
+    public_suffix (4.0.3)
+    rack (2.0.9)
     rack-fiber_pool (0.9.3)
-    rack-protection (2.0.5)
+    rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (12.3.2)
-    redis (4.1.0)
+    rake (12.3.3)
+    redis (4.1.3)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
     resque (2.0.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -126,47 +162,54 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    retriable (3.1.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.3)
     ruby-xz (0.2.3)
       ffi (~> 1.9)
       io-like (~> 0.3)
-    rubyzip (1.2.2)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.0.0)
     safe_yaml (1.0.5)
-    simplecov (0.16.1)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simplecov (0.18.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (2.0.5)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    sqlite3 (1.4.0)
+    sqlite3 (1.4.2)
     stud (0.0.23)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.20.3)
-    tilt (2.0.9)
+    tilt (2.0.10)
+    uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (3.5.1)
@@ -184,10 +227,12 @@ DEPENDENCIES
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   eventmachine (~> 1.0.5)
-  excon (~> 0.62.0)
+  excon (~> 0.72.0)
   ffaker (~> 2.10.0)
   fog-aws (~> 3.4.0)
   fpm (>= 1.11.00)
+  google-api-client (~> 0.31.0)
+  google-api-fcm (~> 0.1.7)
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   net-ssh (~> 5.2.0)
@@ -196,6 +241,7 @@ DEPENDENCIES
   rack-test (~> 1.1.0)
   rhoconnect!
   rspec (~> 3.8.0)
+  signet (~> 0.7)
   simplecov (>= 0.16.1)
   simplecov-rcov (~> 0.2.3)
   sqlite3 (>= 1.4.0)

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rhomobile/rhoconnect.svg?branch=master)](https://travis-ci.org/rhomobile/rhoconnect)
+
 RhoConnect App Integration Server
 -------------------------------------------------------------
 RhoConnect is an app integration server which keeps enterprise data current and available on users’ devices.

data/lib/rhoconnect/ping/fcm.rb

@@ -0,0 +1,74 @@
+require 'google/apis/messages'
+
+# https://firebase.google.com/docs/cloud-messaging/auth-server
+# https://github.com/oniksfly/google-api-fcm
+
+module Rhoconnect
+  class Fcm
+    class InvalidProjectId < Exception; end
+    class InvalidPackageName < Exception; end
+    class FCMPingError < Exception; end
+
+    def self.ping(params)
+      begin
+        fcm_project_id = Rhoconnect.settings[:fcm_project_id]
+        raise InvalidProjectId.new("Missing `:fcm_project_id:` option in settings/settings.yml") unless fcm_project_id
+
+        package_name = Rhoconnect.settings[:package_name]
+        raise InvalidPackageName.new("Missing `:package_name:` option in settings/settings.yml") unless package_name
+        
+        send_ping_to_device(fcm_project_id, package_name, params)
+      rescue InvalidProjectId => error
+        log error
+        log error.backtrace.join("\n")
+        raise error
+      rescue InvalidPackageName => error
+        log error
+        log error.backtrace.join("\n")
+        raise error
+      rescue Exception => error
+        log error
+        log error.backtrace.join("\n")
+        raise error
+      end
+    end
+
+    def self.send_ping_to_device(project_id,package_name,params)
+
+      scope = Google::Apis::Messages::AUTH_MESSAGES
+      authorization = Google::Auth.get_application_default(scope)
+      
+      service = Google::Apis::Messages::MessagesService.new(project_id: project_id)
+      service.authorization = authorization
+      
+      service.notify(fcm_message(package_name,params))
+
+    end
+
+    def self.fcm_message(package_name,params)
+      params.reject! {|k,v| v.nil? || v.length == 0}
+      data = {}
+      data['do_sync'] = params['sources'] ? params['sources'].join(',') : ''
+      data['alert'] = params['message'] if params['message']
+      data['vibrate'] = params['vibrate'] if params['vibrate']
+      data['sound'] = params['sound'] if params['sound']
+      data['phone_id'] = params['phone_id'] if params['phone_id']
+
+      android = {}
+      android['collapse_key'] = (rand * 100000000).to_i.to_s
+      android['priority'] = 'high'
+      android['restricted_package_name'] = package_name
+      android['data'] = data
+      android['notification'] = {}
+      # android['notification']['title'] = 'Test message'
+      android['notification']['body'] = params['message']
+
+      message = Google::Apis::Messages::Message.new(
+        token: params['device_pin'].to_s,
+        android: android
+      )
+      
+      message
+    end
+  end
+end

data/lib/rhoconnect/ping.rb

@@ -1,3 +1,3 @@
 require 'rhoconnect/ping/apple'
 require 'rhoconnect/ping/rhoconnect_push'
-require 'rhoconnect/ping/gcm'
+require 'rhoconnect/ping/fcm'

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '6.2.0'
+  VERSION = '7.5.1'
 end

data/rhoconnect.gemspec

@@ -44,10 +44,14 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra', '~> 2.0.5')
   s.add_dependency('rake', '~> 12.3.2')
   s.add_dependency('json', '>= 1.8', '< 2.0')
-  s.add_dependency('rubyzip', '~> 1.2.2')
+  s.add_dependency('rubyzip', '>= 1.2.2', '< 2.1.0')
   s.add_dependency('connection_pool', '~> 2.2.2')
+  s.add_dependency('redis-namespace', '~> 1.6.0')
   s.add_dependency('redis', '~> 4.1.0')
   s.add_dependency('resque', '>= 2.0.0')
   s.add_dependency('rest-client', '~> 2.0.2')
   s.add_dependency('thor', '~> 0.20.3')
+  s.add_dependency('signet', '~> 0.11.0')
+  s.add_dependency('google-api-client', '~> 0.31.0')
+  s.add_dependency('google-api-fcm', '~> 0.1.7')
 end

data/spec/jobs/ping_job_spec.rb

@@ -33,8 +33,10 @@ describe 'PingJob' do
     scrubbed_params = params.dup
     scrubbed_params['vibrate'] = '5'
 
-    Apple.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
-                                           'device_port' => @c.device_port}.merge!(scrubbed_params))
+    expect(Apple).to receive(:ping).once.with({
+                                                  'device_pin' => @c.device_pin,
+                                                  'device_port' => @c.device_port
+                                              }.merge!(scrubbed_params))
     PingJob.perform(params)
   end
 
@@ -49,7 +51,7 @@ describe 'PingJob' do
               'phone_id' => nil,
               'device_app_id' => nil,
               'device_app_version' => nil}
-    Apple.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
+    expect(Apple).to receive(:ping).once.with({'device_pin' => @c.device_pin,
                                            'device_port' => @c.device_port}.merge!(params))
     PingJob.perform(params)
   end
@@ -66,7 +68,7 @@ describe 'PingJob' do
               'device_app_id' => nil,
               'device_app_version' => nil}
     @c.device_type = 'unknown_device_type'
-    PingJob.should_receive(:log).once.with("Dropping ping request for unsupported platform '#{@c.device_type}'")
+    expect(PingJob).to receive(:log).once.with("Dropping ping request for unsupported platform '#{@c.device_type}'")
     PingJob.perform(params)
   end
 
@@ -81,8 +83,8 @@ describe 'PingJob' do
               'device_app_id' => nil,
               'device_app_version' => nil}
     @c.device_type = nil
-    PingJob.should_receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(PingJob).to receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
   it 'should skip ping for empty device_pin' do
@@ -97,8 +99,8 @@ describe 'PingJob' do
               'device_app_version' => nil, }
     @c.device_type = 'Android'
     @c.device_pin = nil
-    PingJob.should_receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(PingJob).to receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
   it 'should drop ping if it\'s already in user\'s device pin list' do
@@ -119,9 +121,9 @@ describe 'PingJob' do
     @c_fields.delete(:id)
     @c2 = Client.create(@c_fields, {:source_name => @s_fields[:name]})
 
-    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
-    PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(Apple).to receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
+    expect(PingJob).to receive(:log).twice.with(/Dropping ping request for client/)
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
   it 'should drop ping if it\'s already in user\'s phone id list and device pin is different' do
@@ -143,12 +145,12 @@ describe 'PingJob' do
     @c_fields.delete(:id)
     @c2 = Client.create(@c_fields, {:source_name => @s_fields[:name]})
 
-    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
-    PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(Apple).to receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
+    expect(PingJob).to receive(:log).twice.with(/Dropping ping request for client/)
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
-  it 'should ping two different users from two different devices - Apple and GCM' do
+  xit 'should ping two different users from two different devices - Apple and GCM' do
     params = {'user_id' => [@u.id, @u1.id],
               'api_token' => @api_token,
               'sources' => [@s.name],
@@ -165,8 +167,30 @@ describe 'PingJob' do
     scrubbed_params['vibrate'] = '5'
     @c1.device_push_type = 'Gcm'
 
-    Apple.should_receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}))
-    Gcm.should_receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+    expect(Apple).to receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}))
+    expect(Gcm).to receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+    PingJob.perform(params)
+  end
+
+  it 'should ping two different users from two different devices - Apple and FCM' do
+    params = {'user_id' => [@u.id, @u1.id],
+              'api_token' => @api_token,
+              'sources' => [@s.name],
+              'message' => 'hello world',
+              'vibrate' => '5',
+              'badge' => '5',
+              'sound' => 'hello.mp3',
+              'phone_id' => nil,
+              'device_app_id' => nil,
+              'device_app_version' => nil, }
+    @c.phone_id = '3'
+
+    scrubbed_params = params.dup
+    scrubbed_params['vibrate'] = '5'
+    @c1.device_push_type = 'Fcm'
+
+    expect(Apple).to receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}))
+    expect(Fcm).to receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
     PingJob.perform(params)
   end
 
@@ -183,9 +207,9 @@ describe 'PingJob' do
     @c.phone_id = '3'
     @c1.phone_id = '3'
 
-    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
-    PingJob.should_receive(:log).once.with(/Dropping ping request for client/)
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(Apple).to receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
+    expect(PingJob).to receive(:log).once.with(/Dropping ping request for client/)
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
   it 'should drop ping with two different users with the same pin' do
@@ -201,12 +225,12 @@ describe 'PingJob' do
               'device_app_version' => nil, }
     @c1.device_pin = @c.device_pin
 
-    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
-    PingJob.should_receive(:log).once.with(/Dropping ping request for client/)
-    lambda {PingJob.perform(params)}.should_not raise_error
+    expect(Apple).to receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
+    expect(PingJob).to receive(:log).once.with(/Dropping ping request for client/)
+    expect {PingJob.perform(params)}.not_to raise_error
   end
 
-  it 'should process all pings even if some of them are failing' do
+  xit 'should process all pings even if some of them are failing' do
     params = {'user_id' => [@u.id, @u1.id],
               'api_token' => @api_token,
               'sources' => [@s.name],
@@ -226,13 +250,30 @@ describe 'PingJob' do
     params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port})
     allow(Apple).to receive(:ping).with(params).and_raise(SocketError.new("Socket failure"))
     allow(Gcm).to receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
-    exception_raised = false
-    begin
-      PingJob.perform(params)
-    rescue Exception => e
-      exception_raised = true
-    end
-    exception_raised.should == true
+    expect{ PingJob.perform(params)}.to raise_error
+  end
+
+  it 'should process all pings even if some of them are failing' do
+    params = {'user_id' => [@u.id, @u1.id],
+              'api_token' => @api_token,
+              'sources' => [@s.name],
+              'message' => 'hello world',
+              'vibrate' => '5',
+              'badge' => '5',
+              'sound' => 'hello.mp3',
+              'phone_id' => nil,
+              'device_app_id' => nil,
+              'device_app_version' => nil, }
+    @c.phone_id = '3'
+
+    scrubbed_params = params.dup
+    scrubbed_params['vibrate'] = '5'
+    @c1.device_push_type = 'Fcm'
+
+    params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port})
+    allow(Apple).to receive(:ping).with(params).and_raise(SocketError.new("Socket failure"))
+    allow(Fcm).to receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+    expect{ PingJob.perform(params)}.to raise_error
   end
 
   it 'should skip ping for unknown user or user with no clients' do
@@ -246,7 +287,7 @@ describe 'PingJob' do
               'phone_id' => nil,
               'device_app_id' => nil,
               'device_app_version' => nil, }
-    PingJob.should_receive(:log).once.with(/Skipping ping for unknown user 'fake_user' or 'fake_user' has no registered clients.../)
+    expect(PingJob).to receive(:log).once.with(/Skipping ping for unknown user 'fake_user' or 'fake_user' has no registered clients.../)
     PingJob.perform(params)
   end
 
@@ -264,7 +305,7 @@ describe 'PingJob' do
     }
     scrubbed_params = params.dup
 
-    RhoconnectPush.should_receive(:ping).once.with(
+    expect(RhoconnectPush).to receive(:ping).once.with(
         {'device_pin' => @c.device_pin}.merge!(scrubbed_params)
     )
     PingJob.perform(params)

data/spec/ping/fcm_spec.rb

@@ -0,0 +1,116 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe "Ping Android FCM" do
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
+
+  before(:each) do
+    allow( Google::Auth).to receive(:get_application_default)
+    @params = {"device_pin" => @c.device_pin,
+               "sources" => [@s.name], "message" => 'hello world',
+               "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    @response = double('response')
+    Rhoconnect.settings[:fcm_project_id] = 'valid_project_id'
+    Rhoconnect.settings[:package_name] = 'valid_package_name'
+  end
+
+  it "should ping fcm successfully" do
+    stub_request(:post, "https://fcm.googleapis.com/v1/projects/valid_project_id/messages:send").with { |request|
+      hash = JSON.parse request.body
+      valid = hash["message"]["token"] == "abcd"
+      valid = valid && hash["message"]["topic"] == nil
+      valid = valid && hash["message"]["android"]["restricted_package_name"] == "valid_package_name"
+      valid
+    }
+    Fcm.ping(@params)
+  end
+
+  it "should raise error on missing fcm_project_id setting" do
+    key = Rhoconnect.settings[:fcm_project_id.dup]
+    Rhoconnect.settings[:fcm_project_id] = nil
+    expect(lambda { Fcm.ping(@params) }).to raise_error(Fcm::InvalidProjectId, 'Missing `:fcm_project_id:` option in settings/settings.yml')
+    Rhoconnect.settings[:fcm_project_id] = key
+  end
+
+  it "should raise error on missing package_name setting" do
+    key = Rhoconnect.settings[:package_name.dup]
+    Rhoconnect.settings[:package_name] = nil
+    expect(lambda { Fcm.ping(@params) }).to raise_error(Fcm::InvalidPackageName, 'Missing `:package_name:` option in settings/settings.yml')
+    Rhoconnect.settings[:package_name] = key
+  end
+
+  it "should ping fcm with 503 connection error" do
+    stub_request(:post, "https://fcm.googleapis.com/v1/projects/valid_project_id/messages:send").to_raise(RestClient::Exception.new(nil,503))
+    expect(lambda { Fcm.ping(@params) }).to raise_error(RestClient::Exception)
+  end
+
+  xit "should ping fcm with 200 error message" do
+    allow( Google::Auth).to receive(:get_application_default)
+
+    error = 'error:DeviceMessageRateExceeded'
+    allow(@response).to receive(:code).and_return(200)
+    allow(@response).to receive(:body).and_return(error)
+    allow(@response).to receive(:headers).and_return(nil)
+    stub_request(:post, "https://fcm.googleapis.com/v1/projects/valid_project_id/messages:send").to_raise(RestClient::Exception.new(@response,200))
+    expect(lambda { Fcm.ping(@params) }).to raise_error(Fcm::FCMPingError, "FCM ping error: DeviceMessageRateExceeded")
+  end
+
+  xit "should fail to ping with bad authentication" do
+    error = 'Error=BadAuthentication'
+    allow(@response).to receive(:code).and_return(403)
+    allow(@response).to receive(:body).and_return(error)
+    allow(@response).to receive(:headers).and_return({})
+    setup_post_yield(@response)
+    expect(Fcm).to receive(:log).twice
+    expect(lambda { Fcm.ping(@params) }).to raise_error(
+                                                Fcm::InvalidProjectId, "Invalid FCM project id. Obtain new api key from FCM service."
+                                            )
+  end
+
+  xit "should ping fcm with 401 error message" do
+    allow(@response).to receive(:code).and_return(401)
+    allow(@response).to receive(:body).and_return('')
+    setup_post_yield(@response)
+    expect(Fcm).to receive(:log).twice
+    expect(lambda { Fcm.ping(@params) }).to raise_error(
+                                                Fcm::InvalidProjectId, "Invalid FCM project id. Obtain new api key from FCM service."
+                                            )
+  end
+
+  it "should compute fcm_message" do
+    expect(Google::Apis::Messages::Message).to receive(:new) do |options|
+      expect(options[:token]).to eq(@c.device_pin)
+      expect(options[:android]["priority"]).to eq("high")
+      expect(options[:android]["restricted_package_name"]).to eq(Rhoconnect.settings[:package_name])
+      expect(options[:android]["data"]["do_sync"]).to eq(@s.name)
+      expect(options[:android]["data"]["alert"]).to eq("hello world")
+      expect(options[:android]["data"]["vibrate"]).to eq("5")
+      expect(options[:android]["data"]["sound"]).to eq("hello.mp3")
+      expect(options[:android]["notification"]["body"]).to eq("hello world")
+    end
+
+    Fcm.fcm_message(Rhoconnect.settings[:package_name], @params)
+  end
+
+  it "should trim empty or nil params from fcm_message" do
+    expect(Google::Apis::Messages::Message).to receive(:new) do |options|
+      expect(options[:token]).to eq(@c.device_pin)
+      expect(options[:android]["priority"]).to eq("high")
+      expect(options[:android]["restricted_package_name"]).to eq(Rhoconnect.settings[:package_name])
+      expect(options[:android]["data"]["do_sync"]).to eq('')
+      expect(options[:android]["data"]["alert"]).to eq(nil)
+      expect(options[:android]["data"]["vibrate"]).to eq("5")
+      expect(options[:android]["data"]["sound"]).to eq("hello.mp3")
+      expect(options[:android]["notification"]["body"]).to eq(nil)
+    end
+
+    params = {
+        "device_pin" => @c.device_pin,
+        "sources" => [],
+        "message" => '',
+        "vibrate" => '5',
+        "sound" => 'hello.mp3'
+    }
+
+    Fcm.fcm_message(Rhoconnect.settings[:package_name], params)
+  end
+end

data/spec/ping/gcm_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
-describe "Ping Android GCM" do
+xdescribe "Ping Android GCM" do
   include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
 
   before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 7.5.1
 platform: ruby
 authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,16 +90,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +190,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.3
+- !ruby/object:Gem::Dependency
+  name: signet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+- !ruby/object:Gem::Dependency
+  name: google-api-fcm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.7
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables:
@@ -504,6 +566,7 @@ files:
 - lib/rhoconnect/model/js_base.rb
 - lib/rhoconnect/ping.rb
 - lib/rhoconnect/ping/apple.rb
+- lib/rhoconnect/ping/fcm.rb
 - lib/rhoconnect/ping/gcm.rb
 - lib/rhoconnect/ping/rhoconnect_push.rb
 - lib/rhoconnect/predefined_adapters/bench_adapter.rb
@@ -672,6 +735,7 @@ files:
 - spec/perf/perf_spec_helper.rb
 - spec/perf/store_perf_spec.rb
 - spec/ping/apple_spec.rb
+- spec/ping/fcm_spec.rb
 - spec/ping/gcm_spec.rb
 - spec/ping/rhoconnect_push_spec.rb
 - spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb
@@ -721,8 +785,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: RhoConnect App Integration Server
@@ -831,6 +894,7 @@ test_files:
 - spec/perf/perf_spec_helper.rb
 - spec/perf/store_perf_spec.rb
 - spec/ping/apple_spec.rb
+- spec/ping/fcm_spec.rb
 - spec/ping/gcm_spec.rb
 - spec/ping/rhoconnect_push_spec.rb
 - spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb