uc3-dmp-rds 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3091e4b4c758fd05dd75c866ef07a3f43f13daa15c909ee32349161f74b8a32f
-  data.tar.gz: a173d9fa491a0fdb756ec409f8ba0f106e0d155f80a752c23fb9d89964201997
+  metadata.gz: 702eaad4224de108ac5263d173ffd37b34ca51871cdfc54f0998f06c8782aa5b
+  data.tar.gz: 7fe595f87d591809e7b9295e438368e26f0d9fc5f71f7891ef223bc094b02b24
 SHA512:
-  metadata.gz: c762ea939a7536dc10e0a551fe3d8ab6dda43944e59e5a84f32fdcdc9af06712ee4baef7b54e99ed253a99f38cdd12ec39630af990f46cc4957f7189a00c5d4b
-  data.tar.gz: e82053a5d6a44958f7f08d965493dfa4045f36ab7d5e6735f8cc0fabc013c7d1531af879dc4ad4fd83934602f50a6ef5c67f8a7c6ca8c25bfc88248391236e03
+  metadata.gz: 0e79712aed60f791fa03366ad7abe203d9ac3bbba18c1615113c3027619606081b2806f2b3748eadff50dea47487e9257230de8fc743619b1bacaddb1b86ef53
+  data.tar.gz: 99014e54e2fb2d97bdbe47950f3f727d75fe9c9d808098fcd1d4c9de830b4a33a8a60e4b7e25c2f9faa3a5657b12d4623bfcd987135f2eb824bb7c9a9dcb83bf

data/lib/uc3-dmp-rds/authenticator.rb

@@ -14,9 +14,37 @@ module Uc3DmpRds
     MSG_INACTIVE_USER = 'User is inactive'
 
     class << self
+      # Retrieves the User API token from the headers
+      def token_from_headers(headers: {})
+        return nil unless headers.is_a?(Hash) && headers.keys.any?
+
+        authorization = json.select { |k, _v| k.downcase.strip == 'authorization' }
+        parts = authorization.split(' ')
+        return nil unless parts.first.downcase == 'token' && parts.length == 2
+
+        parts.last.strip
+      end
+
+      # Look up the user based on the API token. Will fail if Uc3DmpRds::Adapter does not
+      # have an established connection!
       def authenticate(token:)
         raise AuthenticatorError, MSG_INVALID_TOKEN if token.nil? || token.to_s.strip.empty?
 
+        users = _query_user(token: token)
+        raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) && users.any?
+
+        user = users.first
+        raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
+
+        _serialize_user(user: user)
+      end
+
+      private
+
+      # Query ActiveRecord for the User's record
+      def _query_user(token:)
+        return nil if token.nil?
+
         sql = <<~SQL.squish
           SELECT users.firstname, users.surname, users.email, users.active, i.value orcid,
             orgs.name org_name, ro.name ror_name, ro.ror_id
@@ -32,10 +60,11 @@ module Uc3DmpRds
           LIMIT 1
         SQL
         users = ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
-        raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) and users.any?
+      end
 
-        user = users.first
-        raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
+      # Convert the ActiveRecord query results into a JSON object
+      def _serialize_user(user:)
+        return {} if user.nil? || user['mbox'].nil?
 
         hash = { name: [user['surname'], user['firstname']].join(', '), mbox: user['email'] }
         hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?

data/lib/uc3-dmp-rds/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpRds
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

data/lib/uc3-dmp-rds.rb

@@ -5,5 +5,6 @@ require 'uc3-dmp-rds/adapter'
 
 # RDS Database adapter
 module Uc3DmpRds
+  MSG_MISSING_TOKEN = 'Missing API Token. Expected header: `Authorization: token 12345`'
 end
 # rubocop:enable Naming/FileName

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Brian Riley