uc3-dmp-rds 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9f10b6b78954c6bdeef8a1bc50443c634c8c571bdfe9aac7bc4d923f00c508
-  data.tar.gz: eee363480691189deca29ce254a2e0df7fbb6221d93c1de3d66f99e993bc8c52
+  metadata.gz: f5a1eef3f03371fe98e76dabd04387f03c8d141fb30782ab660c3ef098e6a4e9
+  data.tar.gz: 1823a9005c68985f6f3af990f41255fecd21bf344987e4f9c150aa4873accf04
 SHA512:
-  metadata.gz: e51984f58f45f27f50313f48c3a055ea45eb9259d9928bc8d362b0823f4e290d3c64e136a8aff913c1c68788eb4787e96886fc5760fd896d9be0a5bacc554060
-  data.tar.gz: 0ee0de19a875ef4e317d817e9dbf14ade1e3be187297de10caa315d9d3059e3d6e7bd00d710329621f16e204933bc7ae9a5aa216d07e04a61eb4974fbbcc9aaa
+  metadata.gz: 91bb16e36bec17bff2a6cf257d279b59672c9c6ad30b6c779291c53ea5611fba8ea668455d720e9d924f0376b900f333ae84f3b8b85391ed6b431371dd555371
+  data.tar.gz: 18222b1957ef9b5466e745673cff35a1e9fbe502f5a9facb5947b9aeefdc2d96a9f9f4454831a2938a223c03d4f5315ef297464a683273d90b35dccf7d909872

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

@@ -17,11 +17,19 @@ 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']
 
@@ -36,11 +44,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, perms.name perm_name
+            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
           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
@@ -48,13 +56,19 @@ module Uc3DmpRds
               AND i.identifiable_type = 'User'
               AND i.identifier_scheme_id IN (SELECT sch.id FROM identifier_schemes sch WHERE sch.name = 'orcid')
           WHERE users.api_token = :token
-          LIMIT 1
         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?
 
         hash = {
@@ -67,7 +81,11 @@ module Uc3DmpRds
 
         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?
-        hash.to_json
+
+puts "HASH:"
+puts hash
+
+        hash
       end
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute