shutl_auth 0.8.1 → 0.8.2

data/lib/shutl/auth/access_token_request.rb

@@ -13,7 +13,10 @@ module Shutl
       c = client
 
       Shutl::NetworkRetry.retry "Authentication Service Error" do
-        handling_exceptions { c.access_token! }
+        handling_exceptions do
+          Shutl::Auth.logger.debug "executing Rack::OAuth2::Client request"
+          c.access_token!
+        end
      end
     end
 
@@ -22,6 +25,7 @@ module Shutl
     def handling_exceptions
       yield
     rescue Rack::OAuth2::Client::Error => e
+      Shutl::Auth.logger.error "Rack::OAuth2::Client::Error: #{e.message}"
       case e.message
       when /The client identifier provided is invalid, the client failed to authenticate, the client did not include its credentials, provided multiple client credentials, or used unsupported credentials type\./
         raise_invalid_credentials

data/lib/shutl/auth/authenticated_request.rb

@@ -18,24 +18,38 @@ module Shutl
       end
 
       def request_access_token
-        return session[:access_token] if session[:access_token]
+        Shutl::Auth.logger.debug "request_access_token: in session? #{!!session[:access_token]}"
+        return read_token if read_token
 
+        Shutl::Auth.logger.debug "requesting new access token"
         Shutl::Auth.access_token!
       end
 
       def access_token
-        session[:access_token] ||= request_access_token
+        return read_token if read_token
+        set_token request_access_token
       end
 
       def authenticated_request &blk
         begin
           yield
         rescue Shutl::UnauthorizedAccess => e
-          session[:access_token] = nil
+          Shutl::Auth.logger.debug "Shutl::UnauthorizedAccess - resetting access token"
+          set_token nil
           access_token
           yield
         end
       end
+
+      def read_token
+        Shutl::Auth.logger.debug "access token #{session[:access_token]}"
+        session[:access_token]
+      end
+
+      def set_token(token)
+        Shutl::Auth.logger.debug "setting access token #{token}"
+        session[:access_token] = token
+      end
     end
   end
 end

data/lib/shutl/auth/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Auth
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/lib/shutl_auth.rb

@@ -6,6 +6,8 @@ require "shutl/auth/version"
 require "shutl/auth/access_token_request"
 require "shutl/auth/authenticated_request"
 
+require 'logger'
+
 module Shutl
   module Auth
     extend self
@@ -15,5 +17,11 @@ module Shutl
     def config
       yield self
     end
+
+    def logger
+      return ::Rails.logger if Kernel.const_defined?(:Rails)
+      return ::Shutl.logger if Shutl.respond_to? :logger
+      Logger.new('/dev/null')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_auth
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -154,6 +154,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/license_finder.yml
+- doc/dependencies.csv
+- doc/dependencies.db
+- doc/dependencies.html
 - lib/shutl/auth/access_token_request.rb
 - lib/shutl/auth/authenticated_request.rb
 - lib/shutl/auth/version.rb
@@ -178,12 +182,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1364072325301481292
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1364072325301481292
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23