uc3-dmp-rds 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a1eef3f03371fe98e76dabd04387f03c8d141fb30782ab660c3ef098e6a4e9
-  data.tar.gz: 1823a9005c68985f6f3af990f41255fecd21bf344987e4f9c150aa4873accf04
+  metadata.gz: ef65457155892c90bf5172d0a6bdbcf81f65a9c207f460f37100995f6895f1a6
+  data.tar.gz: 31d3dd6a9c5a831f3aff7c9407dadc0cc1957b19058003fa85f3638dd55b59ab
 SHA512:
-  metadata.gz: 91bb16e36bec17bff2a6cf257d279b59672c9c6ad30b6c779291c53ea5611fba8ea668455d720e9d924f0376b900f333ae84f3b8b85391ed6b431371dd555371
-  data.tar.gz: 18222b1957ef9b5466e745673cff35a1e9fbe502f5a9facb5947b9aeefdc2d96a9f9f4454831a2938a223c03d4f5315ef297464a683273d90b35dccf7d909872
+  metadata.gz: '0196dd990fa57ea307f7a29888f2d96863b764ab20ec0df43d61a7d6180d855b5f3b07c511f3b255e5f70cd10e9a108edc46aa4f3bb034d520112ceecf3cb969'
+  data.tar.gz: 630ea47371bb9a4e353423e3eca70df20302e92716e2ff0020d98b7a80d8a8957392754234176bc92e587929216ecb0a9d988bf5c1e8ada16cd175a88317a03f

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

@@ -2,6 +2,7 @@
 
 require 'active_record'
 require 'active_record_simple_execute'
+require 'json'
 require 'mysql2'
 
 module Uc3DmpRds
@@ -17,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']
 
@@ -57,35 +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['mbox'].nil?
+        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?
         }
         hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?
-        return hash.to_json if user['org_name'].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
-
-        hash
+        JSON.parse(hash.to_json)
       end
     end
   end

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

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

metadata

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