uc3-dmp-rds 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12d1d6576ea3620ee8bf943382a260531b6193a39141173698fd5e70f8fccca9
-  data.tar.gz: '08c112afc6771fa199222358eeb09f7d45821f92775875b639fd0c2d91fc2dbe'
+  metadata.gz: 8c7dc9613b8b085518716b38449b3855839b813d28083fbd2c313eae06513604
+  data.tar.gz: def9b1adf267154ee846e3c9a66b465e6f7f0b3e02c7d6c8845542d4f5f36d0c
 SHA512:
-  metadata.gz: 7d73bf4e5172eee22e80101d452ed41ff9bb3873abff75f90be4f39bd8b858adb8b46f901f1fb4e552a1f3e7a5a1f8f1c3ea04803c021d180bb9a1f04d7ff72f
-  data.tar.gz: a68f4ed811d8af5920c369c23a4452467a092a56aeec302e732cee594065cb439bacc0bbcd6c755fcb78b6cde81d3fd9923c0e8de7af6b09b1bbb3bc6cd93bf1
+  metadata.gz: be45489cb244cff9f7e2e5c7094b393a21006708f2e8276ae64ae4894a8fc9ddf6a2cf0b44a58064065f5b9da963ba5bb0f1068213d12b565f321da76a655f09
+  data.tar.gz: 3d9977589dea3a7d13180221f9ddd3fc6413ceb21e6f210fc1cc944a5103023c165a6058422d91330f2c08238dcf7560028259f17d3910656e38854a476768d4

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

@@ -18,19 +18,11 @@ module Uc3DmpRds
       # Look up the user based on the API token. Will fail if Uc3DmpRds::Adapter does not
       # have an established connection!
       def authenticate(token:)
-
-puts "Authenticator called"
-
-
         raise AuthenticatorError, MSG_INVALID_TOKEN if token.nil? || token.to_s.strip.empty?
 
-puts "TOKEN: #{token}"
-
         users = _query_user(token: token)
         raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) && users.any?
 
-puts "FOUND USER!"
-
         user = users.first
         raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
 
@@ -58,34 +50,24 @@ puts "FOUND USER!"
               AND i.identifier_scheme_id IN (SELECT sch.id FROM identifier_schemes sch WHERE sch.name = 'orcid')
           WHERE users.api_token = :token
         SQL
-
-puts sql
-
         users = ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
       end
 
       # Convert the ActiveRecord query results into a JSON object
       def _serialize_user(user:)
-
-puts "DB RESULTS:"
-puts user
-
         return {} if user.nil? || user['email'].nil?
 
         hash = {
           name: [user['surname'], user['firstname']].join(', '),
           mbox: user['email'],
-          admin: !user['perm_name'].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?
 
         hash[:affiliation] = { name: user.fetch('ror_name', user['org_name']) }
         hash[:affiliation][:affiliation_id] = { type: 'ror', identifier: user['ror_id'] } unless user['ror_id'].nil?
-
-puts "HASH:"
-puts hash
-
         JSON.parse(hash.to_json)
       end
     end

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

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

metadata

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