capcoauth 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d9e9c324526ffa34995e6d9725d10aabefbdfd
-  data.tar.gz: bd77a5ce3fff62a79c5d1503b709279992f255ec
+  metadata.gz: 4d01caf13b1d26c506dc0cb1024079306f7f1bbc
+  data.tar.gz: eae8b93664bc2d3a92732cb041930bcdbdda2e8d
 SHA512:
-  metadata.gz: 461d2c47ca66020cad3818c948939a539988e88b551951434b31399b0eb4aca2d5a7ac091d411d5039cb0b94beef87a6c10e060b0f6adbb5a991b64eb70800e4
-  data.tar.gz: e3a038b04a75bd2c556d6bdf67629034bc8e2851f966b218fb0dfcc62962bd02265f2736d6c09bdf328a90866be7735b9660395919d7e87d7082084da5d72fa6
+  metadata.gz: 17a98e7286027a3a03c957b0b1635db8924db933e8ed688efe176266ca77dab3378d6fb58df220d88a4882f9ffcc3c7966b33b5b1fb7a9216c0323547ae2a352
+  data.tar.gz: 9c70e143373d22799b4fc1c8b27b2b6567bc5a472392a55a751ae1e88e6809836cf989c1bf7baa716d5c3fbee175a9e2d0e7af2994a7e4c8e5dba3e93904e9eb

data/lib/capcoauth/config.rb

@@ -74,5 +74,10 @@ module Capcoauth
 
     option :token_verify_ttl, default: 10
     option :capcoauth_url, default: 'https://capcoauth.capco.com'
+    option :user_id_field, default: :capcoauth
+    option :user_resolver, default: (lambda do |capcoauth_user_id|
+      Capcoauth.configuration.logger.warn('[CapcOAuth] User resolver is not configured. Please specify a block in configuration to resolve the proper user')
+      nil
+    end)
   end
 end

data/lib/capcoauth/oauth/token_verifier.rb

@@ -20,13 +20,28 @@ module Capcoauth
 
         # Set the user_id from the token response
         if response.code == 200
-          access_token.user_id = response.parsed_response['resource_owner_id']
+
+          # Get the proper ID value field from the response
+          user_id_field = Capcoauth.configuration.user_id_field
+          if user_id_field == :capcoauth
+            access_token.user_id = response.parsed_response['resource_owner_id']
+          else
+            access_token.user_id = response.parsed_response['external_ids'][user_id_field.to_s]
+          end
+
+          # Throw unauthorized if ID of specified type doesn't exist
+          unless access_token.user_id
+            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
+
+          # Verify token is for correct application/client
           if response.parsed_response.fetch('application', {}).fetch('uid', nil) === Capcoauth.configuration.client_id
-            logger.info("CapcOAuth: The access token for user ##{access_token.user_id} was verified successfully") unless logger.nil?
+            logger.info("CapcOAuth: The access token for #{user_id_field} user ##{access_token.user_id} was verified successfully") unless logger.nil?
             TTLCache.update(access_token.token, access_token.user_id)
             access_token
           else
-            logger.info("CapcOAuth: The access token for user ##{access_token.user_id} was valid, but for a different OAuth client ID") unless logger.nil?
+            logger.info("CapcOAuth: The access token for #{user_id_field} user ##{access_token.user_id} was valid, but for a different OAuth client ID") unless logger.nil?
             raise UnauthorizedError
           end
         elsif response.code == 401

data/lib/capcoauth/rails/helpers.rb

@@ -12,7 +12,7 @@ module Capcoauth
           session.delete(:previous_url)
         end
 
-        @current_user_id ||= capcoauth_token.user_id
+        @capcoauth_user_id ||= capcoauth_token.user_id
       rescue OAuth::TokenVerifier::UnauthorizedError
         if handle_sessions?
           session[:previous_url] = request.url
@@ -30,7 +30,17 @@ module Capcoauth
 
       def current_user
         verify_authorized!
-        @current_user ||= User.find_by_id @current_user_id
+
+        # Resolve user ID using configuration resolver unless already found
+        unless @current_user
+          begin
+            @current_user = Capcoauth.configuration.user_resolver.call(@capcoauth_user_id)
+          rescue ActiveRecord::RecordNotFound => e
+            Capcoauth.configuration.logger.warn "[CapcOAuth] Error looking up user - #{e.message}"
+          end
+        end
+
+        @current_user
       end
 
       protected

data/lib/capcoauth/version.rb

@@ -1,3 +1,3 @@
 module Capcoauth
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/generators/capcoauth/templates/initializer.rb

@@ -18,4 +18,13 @@ Capcoauth.configure do |config|
 
   # Configure the logger to use for OAuth events
   config.logger Rails.logger
+
+  # Configure which ID to identify the user by.  Valid options are :capcoauth, :capco (4-letter), :psoft, :e_number, and :cit
+  # config.user_id_field :capcoauth
+
+  # Block to resolve your user from the provided CapcOAuth ID.  If you're using different primary keys than any of the
+  # existing services, you might consider looking up by an external ID, e.g. `User.find_by_psoft_id! capcoauth_user_id`
+  config.user_resolver do |capcoauth_user_id|
+    User.find capcoauth_user_id
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capcoauth
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties