omniauth-linnworks 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730618c18a2406af3f6d46a61677a757a38ddb15
-  data.tar.gz: adc4d8befe716dceb1ee1bd52d6c9cc1d46a202c
+  metadata.gz: e27e61ad5e413eb1eba2b38d83a6907194f0f844
+  data.tar.gz: ac4ebdbce82b361d4aca30d8e3e8aefced08bb9e
 SHA512:
-  metadata.gz: e0440ed3f84c290c729516937fab322f04198b75743a7ea205ebb79d26cdffe728cf61952616be1e9b82404c8af4f0bc11c582ca1f4cb44fc66b7968dd34f650
-  data.tar.gz: 06688addf507602913561791017537f0129a4c29ecc3e6f09c5049b1c836924e1e14dcf05bc579bffca563c414472b15d5320635e87d8e95724ec2ee1be0991d
+  metadata.gz: 98569ca49315c3207a381166c7adcd6c4d2f9bf89c01a99506b829b88eb93dabb284186f1c0ab5c24f567a97bd3456e6034fec8a44a7e4a0f6e9d0e7d79c40cb
+  data.tar.gz: 9e3dddc8f8f8a50dd070373f2869e83ea055b7426db6c23938b96f00158364db6826ecc67e9ae50373e482b288c24c67c31469ef2d3b82dc7f09d6f983697612

data/lib/omniauth-linnworks/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Linnworks
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/omniauth/strategies/linnworks.rb

@@ -29,38 +29,33 @@ module OmniAuth
       end
 
       def callback_phase # rubocop:disable MethodLength
-        fail(OmniAuth::NoSessionError, "Session Expired") if session["oauth"].nil?
-
-        params = @env['omniauth.params']
-
         @response = Faraday.post('https://api.linnworks.net//api/Auth/AuthorizeByApplication', {"applicationId" => options.application_id, 
                                                                                       "applicationSecret" => options.application_secret,
-                                                                                      "token" => params['token']})
+                                                                                      "token" => request.params['token']})
 
         fail!(:error, Exception.new(JSON.parse(@response.body))) unless @response.success?
+        super
       rescue ::Timeout::Error => e
         fail!(:timeout, e)
       rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
-      rescue ::OmniAuth::NoSessionError => e
-        fail!(:session_expired, e)
-      end
-
-      def raw_info
-        @raw_info ||= JSON.parse(response.body)
       end
 
       uid { raw_info['Id'].to_s }
 
-      credentials do
-        {"token" => raw_info['Token'] }
-      end        
+      info { raw_info }
+
+      credentials { {"token" => raw_info['Token'] } }
       
       private 
 
       attr_reader :response
+      
+      def raw_info
+        @raw_info ||= JSON.parse(response.body)
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-linnworks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Karl Falconer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth