uc3-dmp-rds 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8baeefeaefa3440ab7fd1dd17f82597e3a0bdebf56ca00a204cab9fee9fdb0
-  data.tar.gz: 6517005d0c6dee5e89274063811ecc73e8f97f25e6e363ed807c4fd2d05d267f
+  metadata.gz: 12d1d6576ea3620ee8bf943382a260531b6193a39141173698fd5e70f8fccca9
+  data.tar.gz: '08c112afc6771fa199222358eeb09f7d45821f92775875b639fd0c2d91fc2dbe'
 SHA512:
-  metadata.gz: f82f8dcd0237f542278a0a296a2a4aac96cc99c50455eae77e66e192cc4b64b451d4bb5fa5b2bca8c38fd3d12bd906c17d0b0a2bb7d309d83b30d4ccbaf7d624
-  data.tar.gz: edcda33c09cef2fae6de7a85cf345c4cd75a915b7575830096d22f7e7fe876ee829b402519003c72f1f3dfc07d340c14c6cb1b753d675b8ee68bd569b9975eac
+  metadata.gz: 7d73bf4e5172eee22e80101d452ed41ff9bb3873abff75f90be4f39bd8b858adb8b46f901f1fb4e552a1f3e7a5a1f8f1c3ea04803c021d180bb9a1f04d7ff72f
+  data.tar.gz: a68f4ed811d8af5920c369c23a4452467a092a56aeec302e732cee594065cb439bacc0bbcd6c755fcb78b6cde81d3fd9923c0e8de7af6b09b1bbb3bc6cd93bf1

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,6 +18,10 @@ 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}"
@@ -65,7 +70,7 @@ puts sql
 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(', '),
@@ -73,7 +78,7 @@ puts user
           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?
+        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?
@@ -81,7 +86,7 @@ puts user
 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.15'
+  VERSION = '0.0.17'
 end

metadata

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