omniauth-hubspot 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8399bd54000f6cc86cc09356f31089e387958c4
-  data.tar.gz: 53481709295bde3090513bd61639b56fd1259987
+  metadata.gz: ff582e0a2ff6a180336b6998b1c7441cc08ba30f
+  data.tar.gz: 440cc99e40a4e0240c76ca833cebbc4c7f4bd541
 SHA512:
-  metadata.gz: a195902781e786d14594cc61513a2555cfddaf2d559730187b384bdfb1b1ea6d59003e28cae1956e278312b6e8dabff747f5522e603e14133e99bfda2f9d3394
-  data.tar.gz: 528d2d2074ebd43358fa80bc22342095de619170c513edb1c2fefa19181fb13be944b914f08286dc101a2bf824e45d3518e4aab00e27da5deed0e238699337d4
+  metadata.gz: acda4f00c15d095d5ab33e61bc45462234a0945ce23d777987cd18ce0da76b617c7f38ad580344eddc9bee6b389b80f569c539b2b6f6cc5b0613a69b58573b90
+  data.tar.gz: f27983b51d507be593a6898c8980e65e0f2173f390e0ebb0f4f3bd7c3d9c80fe73a40f7e815b95155d5c0576783f1f26489aa5d344602ea2f74fe023a68226a6

data/lib/omniauth/hubspot/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module HubSpot
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/lib/omniauth/strategies/hubspot.rb

@@ -1,46 +1,50 @@
-require 'omniauth-oauth'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class HubSpot < OmniAuth::Strategies::OAuth
+    class HubSpot < OmniAuth::Strategies::OAuth2
 
       args [:client_id]
 
       option :name, "hubspot"
+      option :provider_ignores_state, true
 
       option :client_options, {
         :site => 'https://app.hubspot.com',
         :authorize_url => '/auth/authenticate'
       }
 
-      def callback_phase
-        raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
+      option :authorize_options, [:scope, :portalId]
+
+      attr_accessor :refresh_token
+      attr_accessor :expires_in
 
-        opts = {}
-        if session['oauth'][name.to_s]['callback_confirmed']
-          opts[:oauth_verifier] = request['oauth_verifier']
-        else
-          opts[:oauth_callback] = callback_url
+      def callback_phase
+        if request.params['error'] || request.params['error_reason']
+          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
+        end
+        if !options.provider_ignores_state && (request.params['state'].to_s.empty? || request.params['state'] != session.delete('omniauth.state'))
+          raise CallbackError.new(nil, :csrf_detected)
         end
 
-        @access_token = params[:access_token]
-        @refresh_token = params[:refresh_token]
-        @expires_in = params[:expires_in]
+        self.access_token = params[:access_token]
+
         super
-      rescue ::Timeout::Error => e
-        fail!(:timeout, e)
-      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
-        fail!(:service_unavailable, e)
-      rescue ::OAuth::Unauthorized => e
+      rescue ::OAuth2::Error, CallbackError => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
-      rescue ::OmniAuth::NoSessionError => e
-        fail!(:session_expired, e)
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT, Faraday::Error::TimeoutError => e
+        fail!(:timeout, e)
+      rescue ::SocketError, Faraday::Error::ConnectionFailed => e
+        fail!(:failed_to_connect, e)
       end
 
       credentials do
-        {'access_token' => @access_token, 'refresh_token' => @refresh_token, 'expires_in' => @expires_in}
+        hash = {'token' => access_token}
+        hash.merge!('refresh_token' => refresh_token)
+        hash.merge!('expires_in' => expires_in)
+        hash
       end
 
     end

data/omniauth-hubspot.gemspec

@@ -3,8 +3,8 @@ require File.expand_path('../lib/omniauth/hubspot/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth'
-  gem.add_dependency 'oauth'
-  gem.add_dependency 'omniauth-oauth'
+  gem.add_dependency 'oauth2'
+  gem.add_dependency 'omniauth-oauth2'
 
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'rack-test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-hubspot
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Daniel Arnold
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='