intercom-rails 0.2.6 → 0.2.7

data/lib/intercom-rails/script_tag.rb

@@ -16,8 +16,8 @@ module IntercomRails
       self.secret = options[:secret] || Config.api_secret
       self.widget_options = widget_options_from_config.merge(options[:widget] || {})
       self.controller = options[:controller]
-      self.user_details = options[:find_current_user_details] ? find_current_user_details : options[:user_details] 
-      self.company_details = if options[:find_current_company_details] 
+      self.user_details = options[:find_current_user_details] ? find_current_user_details : options[:user_details]
+      self.company_details = if options[:find_current_company_details]
         find_current_company_details
       elsif options[:user_details]
         options[:user_details].delete(:company) if options[:user_details]
@@ -35,7 +35,7 @@ module IntercomRails
       hsh
     end
 
-    def output 
+    def output
       str = <<-INTERCOM_SCRIPT
 <script id="IntercomSettingsScriptTag">
   var intercomSettings = #{ActiveSupport::JSON.encode(intercom_settings)};
@@ -75,7 +75,7 @@ module IntercomRails
     def find_current_user_details
       return {} unless controller.present?
       Proxy::User.current_in_context(controller).to_hash
-    rescue NoUserFoundError 
+    rescue NoUserFoundError
       {}
     end
 
@@ -94,8 +94,7 @@ module IntercomRails
     end
 
     def user_hash
-      components = [secret, (user_details[:user_id] || user_details[:email])]
-      Digest::SHA1.hexdigest(components.join)
+      OpenSSL::HMAC.hexdigest("sha256", secret, (user_details[:user_id] || user_details[:email]))
     end
 
     def app_id
@@ -105,7 +104,7 @@ module IntercomRails
       nil
     end
 
-    def widget_options_from_config 
+    def widget_options_from_config
       config = {}
 
       activator = case Config.inbox.style

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/test/intercom-rails/auto_include_filter_test.rb

@@ -125,7 +125,7 @@ class AutoIncludeFilterTest < ActionController::TestCase
 
     assert_includes @response.body, "<script>"
     assert_includes @response.body, "user_hash"
-    assert_includes @response.body, Digest::SHA1.hexdigest('abcd' + @controller.current_user.email)
+    assert_includes @response.body, OpenSSL::HMAC.hexdigest("sha256", 'abcd', @controller.current_user.email)
   end
 
   def test_no_app_id_present

data/test/intercom-rails/script_tag_test.rb

@@ -40,29 +40,29 @@ class ScriptTagTest < MiniTest::Unit::TestCase
 
   def test_secure_mode_with_email
     script_tag = ScriptTag.new(:user_details => {:email => 'ciaran@intercom.io'}, :secret => 'abcdefgh')
-    assert_equal Digest::SHA1.hexdigest('abcdefgh' + 'ciaran@intercom.io'), script_tag.intercom_settings[:user_hash]
+    assert_equal OpenSSL::HMAC.hexdigest("sha256", 'abcdefgh', 'ciaran@intercom.io'), script_tag.intercom_settings[:user_hash]
   end
 
   def test_secure_mode_with_user_id
     script_tag = ScriptTag.new(:user_details => {:user_id => '1234'}, :secret => 'abcdefgh')
-    assert_equal Digest::SHA1.hexdigest('abcdefgh' + '1234'), script_tag.intercom_settings[:user_hash]
+    assert_equal OpenSSL::HMAC.hexdigest("sha256", 'abcdefgh', '1234'), script_tag.intercom_settings[:user_hash]
   end
 
   def test_secure_mode_with_email_and_user_id
     script_tag = ScriptTag.new(:user_details => {:user_id => '1234', :email => 'ciaran@intercom.io'}, :secret => 'abcdefgh')
-    assert_equal Digest::SHA1.hexdigest('abcdefgh' + '1234'), script_tag.intercom_settings[:user_hash]
+    assert_equal OpenSSL::HMAC.hexdigest("sha256", 'abcdefgh', '1234'), script_tag.intercom_settings[:user_hash]
   end
 
   def test_secure_mode_with_secret_from_config
     IntercomRails.config.api_secret = 'abcd'
     script_tag = ScriptTag.new(:user_details => {:email => 'ben@intercom.io'})
-    assert_equal Digest::SHA1.hexdigest('abcd' + 'ben@intercom.io'), script_tag.intercom_settings[:user_hash]
+    assert_equal OpenSSL::HMAC.hexdigest("sha256", 'abcd', 'ben@intercom.io'), script_tag.intercom_settings[:user_hash]
   end
 
   def test_secure_mode_chooses_passed_secret_over_config
     IntercomRails.config.api_secret = 'abcd'
     script_tag = ScriptTag.new(:user_details => {:email => 'ben@intercom.io'}, :secret => '1234')
-    assert_equal Digest::SHA1.hexdigest('1234' + 'ben@intercom.io'), script_tag.intercom_settings[:user_hash]
+    assert_equal OpenSSL::HMAC.hexdigest("sha256", '1234', 'ben@intercom.io'), script_tag.intercom_settings[:user_hash]
   end
 
   def test_inbox_default_style

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors: