uc3-dmp-rds 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702eaad4224de108ac5263d173ffd37b34ca51871cdfc54f0998f06c8782aa5b
-  data.tar.gz: 7fe595f87d591809e7b9295e438368e26f0d9fc5f71f7891ef223bc094b02b24
+  metadata.gz: 2c9f10b6b78954c6bdeef8a1bc50443c634c8c571bdfe9aac7bc4d923f00c508
+  data.tar.gz: eee363480691189deca29ce254a2e0df7fbb6221d93c1de3d66f99e993bc8c52
 SHA512:
-  metadata.gz: 0e79712aed60f791fa03366ad7abe203d9ac3bbba18c1615113c3027619606081b2806f2b3748eadff50dea47487e9257230de8fc743619b1bacaddb1b86ef53
-  data.tar.gz: 99014e54e2fb2d97bdbe47950f3f727d75fe9c9d808098fcd1d4c9de830b4a33a8a60e4b7e25c2f9faa3a5657b12d4623bfcd987135f2eb824bb7c9a9dcb83bf
+  metadata.gz: e51984f58f45f27f50313f48c3a055ea45eb9259d9928bc8d362b0823f4e290d3c64e136a8aff913c1c68788eb4787e96886fc5760fd896d9be0a5bacc554060
+  data.tar.gz: 0ee0de19a875ef4e317d817e9dbf14ade1e3be187297de10caa315d9d3059e3d6e7bd00d710329621f16e204933bc7ae9a5aa216d07e04a61eb4974fbbcc9aaa

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

@@ -14,17 +14,6 @@ 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:)
@@ -47,9 +36,11 @@ module Uc3DmpRds
 
         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
@@ -66,7 +57,11 @@ module Uc3DmpRds
       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.12'
+  VERSION = '0.0.14'
 end

data/lib/uc3-dmp-rds.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'uc3-dmp-rds/adapter'
+require 'uc3-dmp-rds/authenticator'
 
 # RDS Database adapter
 module Uc3DmpRds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 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