uc3-dmp-rds 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9758c1818c2bd5f8b44b16bc01bf5a99a98ef04fba84d4e123bc970978e8322c
-  data.tar.gz: b311b8e02f25fb735831b63758d86e9691c3d2e71595016d43281019a385c26d
+  metadata.gz: 1866fcb5ab8870fe909f30010bae7fe9b84ea1b1f8449075dcd7eaf3552e5a92
+  data.tar.gz: 7f01d3802e480af2c253fdf3c56d23fdcb1d624a4511d09938d33dda49a3c192
 SHA512:
-  metadata.gz: aeb916ba0027daececd547e5a80146eb579f3c6eb8f05d23a395c8cf0b676132b923ef1488e38492c0301b28e374eae7854a347217f09f15be5a367eb7ee883e
-  data.tar.gz: e90e2d8628a56e911aed3d2b2c182520fc5c7d985b91148c91dab378d07e92f4acd160cb041cada3a6fee792ac4c5d1364a08ee82148917792205f3ad478c6c0
+  metadata.gz: cb4f83e0f493c1300f3231bde8c5f7bfb805a0adaf8d15e8d7cd84bc31ff6251917effc5162c6c370dcefce5775a4acda56de14d3728c2d1030c8cbece37e805
+  data.tar.gz: cf06caa490d75570cc0f9211d96d6bcc92aa61abff81160ef70c05355932f7dce4eade037409711ecf7e829ae829b50f465873a341f1d7ed92681cd3fdca4964

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

@@ -14,14 +14,44 @@ 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
+            orgs.name org_name, ro.name ror_name, ro.ror_id, perms.name perm_name
           FROM users
             INNER JOIN orgs ON users.org_id = orgs.id
+            LEFT OUTER JOIN users_perms up ON users.id = up.user_id
+              LEFT OUTER JOIN perms ON up.perm_id = perms.id AND perms.name = 'modify_templates'
             LEFT OUTER JOIN registry_orgs ro
               ON orgs.id = ro.org_id
             LEFT OUTER JOIN identifiers i
@@ -32,12 +62,17 @@ 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 = {
+          name: [user['surname'], user['firstname']].join(', '),
+          mbox: user['email'],
+          admin: !user['perm_name'].nil?
+        }
         hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?
         return hash.to_json if user['org_name'].nil?
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute