uc3-dmp-rds 0.0.18 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef65457155892c90bf5172d0a6bdbcf81f65a9c207f460f37100995f6895f1a6
-  data.tar.gz: 31d3dd6a9c5a831f3aff7c9407dadc0cc1957b19058003fa85f3638dd55b59ab
+  metadata.gz: 556a5c27b265c712a98fc858b989731699df14085366ed2c6d34ab2cab96764f
+  data.tar.gz: 97c6eca72baa2f61d14af830b27e2f712bd345f8987b14e806413c3d57aa8e7d
 SHA512:
-  metadata.gz: '0196dd990fa57ea307f7a29888f2d96863b764ab20ec0df43d61a7d6180d855b5f3b07c511f3b255e5f70cd10e9a108edc46aa4f3bb034d520112ceecf3cb969'
-  data.tar.gz: 630ea47371bb9a4e353423e3eca70df20302e92716e2ff0020d98b7a80d8a8957392754234176bc92e587929216ecb0a9d988bf5c1e8ada16cd175a88317a03f
+  metadata.gz: 3abd42f8fa4240b227fada42f88ea80b334cba106038ec0b188f59a0eae1846b3be21290bfb99a2279eb53ae09dbb59f9fb84a34a8a4d9a84ced15e3136b7213
+  data.tar.gz: 25ff9c28b1c097aacefa95692b0a4614ee9c7045c001b71e2330990e371ec6649be8cd9389387da90a7b28832870a9ac1646c571d737279e7eda3d0408c49170

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

@@ -36,7 +36,7 @@ module Uc3DmpRds
         return nil if token.nil?
 
         sql = <<~SQL.squish
-          SELECT users.firstname, users.surname, users.email, users.active, i.value orcid,
+          SELECT users.id, users.firstname, users.surname, users.email, users.active, i.value orcid,
             orgs.name org_name, ro.name ror_name, ro.ror_id,
             (SELECT perms.name FROM users_perms up LEFT OUTER JOIN perms ON up.perm_id = perms.id
              WHERE users.id = up.user_id AND perms.name = 'modify_templates') perm
@@ -58,9 +58,11 @@ module Uc3DmpRds
         return {} if user.nil? || user['email'].nil?
 
         hash = {
+          id: user.id,
           name: [user['surname'], user['firstname']].join(', '),
           mbox: user['email'],
-          admin: !user['perm'].nil?
+          admin: !user['perm'].nil?,
+          active: user.fetch('active', false)
         }
         hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?
         return hash 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.18'
+  VERSION = '0.0.21'
 end

data/lib/uc3-dmp-rds.rb

@@ -7,5 +7,6 @@ require 'uc3-dmp-rds/authenticator'
 # RDS Database adapter
 module Uc3DmpRds
   MSG_MISSING_TOKEN = 'Missing API Token. Expected header: `Authorization: token 12345`'
+  MSG_MISSING_USER = 'Unknown or unauthenticated user'
 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.18
+  version: 0.0.21
 platform: ruby
 authors:
 - Brian Riley