capcoauth 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5ff4301f9a840184240a23652d81b5cfceff9a
-  data.tar.gz: 6409b7fefea4194a2552468783e83dbe6037d033
+  metadata.gz: 8ec44b77288ba8927780f0b45b3cb545d5268582
+  data.tar.gz: 57c2652a7fc0dc729d92496d82ccf3abf4aedac5
 SHA512:
-  metadata.gz: 4aba21febd219d18ec7cc8e7e7d5a9f6875be5da5cf7764094237e147c9b1e70048347e8866f7e0c37018be0a12fceb3e12f8a12e33763ac9497bb28663d540e
-  data.tar.gz: 033cc72215fe37ac75b3eca0ea9000070cdd933dba277877f82bee33c6450c008177135ecc31b81c2889a7ab2580853f319b6931ed72e8221868017c87d4ad7e
+  metadata.gz: 44933c8af8c9e94741dedbcb67577e6e06f2028134590be3b79f9915fbaa8907310dc4d70313758552232c2f8d5aaa801131b546b30af782b7739610a7c73ffa
+  data.tar.gz: 10206151a2418737ddac3147bfceba635237d30452bec9310b6793db2f463a1801962b4e7d0e193e72d1c5c34d682e203473d4186681e92b99841feabd68f43e

data/lib/capcoauth/oauth/token_verifier.rb

@@ -21,6 +21,9 @@ module Capcoauth
         # Set the user_id from the token response
         if response.code == 200
 
+          # Detect application credentials
+          application_credentials = response.parsed_response['resource_owner_id'].blank?
+
           # Get the proper ID value field from the response
           user_id_field = Capcoauth.configuration.user_id_field
           if user_id_field == :capcoauth
@@ -30,7 +33,7 @@ module Capcoauth
           end
 
           # Throw unauthorized if ID of specified type doesn't exist
-          unless access_token.user_id
+          if access_token.user_id.blank? and !application_credentials
             logger.info("CapcOAuth: The access token for #{user_id_field} user ##{access_token.user_id} did not have an ID for type `#{user_id_field}`") unless logger.nil?
             raise UnauthorizedError
           end

data/lib/capcoauth/rails/helpers.rb

@@ -43,6 +43,10 @@ module Capcoauth
         @current_user
       end
 
+      def capcoauth_token
+        @_capcoauth_token ||= OAuth::AccessToken.new(token_from_request)
+      end
+
       protected
 
         def handle_unauthorized
@@ -59,10 +63,6 @@ module Capcoauth
 
       private
 
-        def capcoauth_token
-          @_capcoauth_token ||= OAuth::AccessToken.new(token_from_request)
-        end
-
         def token_from_request
           token_from_param || token_from_session || token_from_headers
         end

data/lib/capcoauth/version.rb

@@ -1,3 +1,3 @@
 module Capcoauth
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capcoauth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Adam Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties