uc3-dmp-rds 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1866fcb5ab8870fe909f30010bae7fe9b84ea1b1f8449075dcd7eaf3552e5a92
-  data.tar.gz: 7f01d3802e480af2c253fdf3c56d23fdcb1d624a4511d09938d33dda49a3c192
+  metadata.gz: ab8baeefeaefa3440ab7fd1dd17f82597e3a0bdebf56ca00a204cab9fee9fdb0
+  data.tar.gz: 6517005d0c6dee5e89274063811ecc73e8f97f25e6e363ed807c4fd2d05d267f
 SHA512:
-  metadata.gz: cb4f83e0f493c1300f3231bde8c5f7bfb805a0adaf8d15e8d7cd84bc31ff6251917effc5162c6c370dcefce5775a4acda56de14d3728c2d1030c8cbece37e805
-  data.tar.gz: cf06caa490d75570cc0f9211d96d6bcc92aa61abff81160ef70c05355932f7dce4eade037409711ecf7e829ae829b50f465873a341f1d7ed92681cd3fdca4964
+  metadata.gz: f82f8dcd0237f542278a0a296a2a4aac96cc99c50455eae77e66e192cc4b64b451d4bb5fa5b2bca8c38fd3d12bd906c17d0b0a2bb7d309d83b30d4ccbaf7d624
+  data.tar.gz: edcda33c09cef2fae6de7a85cf345c4cd75a915b7575830096d22f7e7fe876ee829b402519003c72f1f3dfc07d340c14c6cb1b753d675b8ee68bd569b9975eac

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

@@ -14,25 +14,18 @@ module Uc3DmpRds
     MSG_INACTIVE_USER = 'User is inactive'
 
     class << self
-      # Retrieves the User API token from the headers
-      def token_from_headers(headers: {})
-        return nil unless headers.is_a?(Hash) && headers.keys.any?
-
-        authorization = json.select { |k, _v| k.downcase.strip == 'authorization' }
-        parts = authorization.split(' ')
-        return nil unless parts.first.downcase == 'token' && parts.length == 2
-
-        parts.last.strip
-      end
-
       # Look up the user based on the API token. Will fail if Uc3DmpRds::Adapter does not
       # have an established connection!
       def authenticate(token:)
         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']
 
@@ -47,11 +40,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
@@ -59,13 +52,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 = {
@@ -78,7 +77,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.13'
+  VERSION = '0.0.15'
 end

data/lib/uc3-dmp-rds.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'uc3-dmp-rds/adapter'
+require 'uc3-dmp-rds/authenticator'
 
 # RDS Database adapter
 module Uc3DmpRds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 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