uc3-dmp-rds 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702eaad4224de108ac5263d173ffd37b34ca51871cdfc54f0998f06c8782aa5b
-  data.tar.gz: 7fe595f87d591809e7b9295e438368e26f0d9fc5f71f7891ef223bc094b02b24
+  metadata.gz: 1866fcb5ab8870fe909f30010bae7fe9b84ea1b1f8449075dcd7eaf3552e5a92
+  data.tar.gz: 7f01d3802e480af2c253fdf3c56d23fdcb1d624a4511d09938d33dda49a3c192
 SHA512:
-  metadata.gz: 0e79712aed60f791fa03366ad7abe203d9ac3bbba18c1615113c3027619606081b2806f2b3748eadff50dea47487e9257230de8fc743619b1bacaddb1b86ef53
-  data.tar.gz: 99014e54e2fb2d97bdbe47950f3f727d75fe9c9d808098fcd1d4c9de830b4a33a8a60e4b7e25c2f9faa3a5657b12d4623bfcd987135f2eb824bb7c9a9dcb83bf
+  metadata.gz: cb4f83e0f493c1300f3231bde8c5f7bfb805a0adaf8d15e8d7cd84bc31ff6251917effc5162c6c370dcefce5775a4acda56de14d3728c2d1030c8cbece37e805
+  data.tar.gz: cf06caa490d75570cc0f9211d96d6bcc92aa61abff81160ef70c05355932f7dce4eade037409711ecf7e829ae829b50f465873a341f1d7ed92681cd3fdca4964

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

@@ -47,9 +47,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 +68,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.13'
 end

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.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