uc3-dmp-rds 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604c79df5be49af7962a127336f3218c425eec327437a457856a485c23a552ce
-  data.tar.gz: d44673cf381d1c9786eace556ca14a38baa7f721ad3219eec5402e6950565fa0
+  metadata.gz: bd9a51c00223257f3aa00133b904f00e0c8cede3f166d9521accf5759f928b1a
+  data.tar.gz: 4ca625aa165517ca2f8dd3dd9e4ee14a7188ed44bf65f13dc5f6be65afcd31bd
 SHA512:
-  metadata.gz: 31e6c505b927e29dde9fb672c2a5ac7408eff714595ad8e96c510e016e8493d7f1f59cd9140de6ffea8274ef103cea2121f295fa5ff6cdd5c90e6f40ea3611e9
-  data.tar.gz: b65f2969d658f2fdacf796f6f4c009153271900ccd3bed34e7c26c604ad69b1af44435f0f6caa39b5f2c72ac36033786380a6ce3c1e264ac2f759cfa3ee449de
+  metadata.gz: 9b647640ad6a581e0721cbdd43cd0c6b033c45578ee3e6bb2d44f2c3537d896a5994146f4d995bdb67769a5ff13bfbd38eec29a38124363fd0046d9108829c52
+  data.tar.gz: 319c3c1b995efe7089852318080e6321658aab5bc9099c3c6939e5ca5cb609275f3944e1335ed36794cc16e172049e20d0c4071a71868f06dbc47ac38cefe449

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

@@ -36,8 +36,8 @@ module Uc3DmpRds
           host: ENV.fetch('DATABASE_HOST', nil),
           port: ENV.fetch('DATABASE_PORT', nil),
           database: ENV.fetch('DATABASE_NAME', nil),
-          username: username,
-          password: password,
+          username:,
+          password:,
           encoding: 'utf8mb4'
         )
         !connection.nil?
@@ -50,7 +50,7 @@ module Uc3DmpRds
       def execute_query(sql:, **params)
         return [] unless sql.is_a?(String) && !sql.strip.empty? && (params.nil? || params.is_a?(Hash))
         # Verify that all of the kewords are accounted for and that values were supplied
-        raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql: sql, params: params)
+        raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql:, params:)
 
         ActiveRecord::Base.simple_execute(sql, params)
       rescue StandardError => e

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

@@ -20,13 +20,13 @@ module Uc3DmpRds
       def authenticate(token:)
         raise AuthenticatorError, MSG_INVALID_TOKEN if token.nil? || token.to_s.strip.empty?
 
-        users = _query_user(token: token)
+        users = _query_user(token:)
         raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) && users.any?
 
         user = users.first
         raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
 
-        _serialize_user(user: user)
+        _serialize_user(user:)
       end
 
       private
@@ -37,7 +37,7 @@ module Uc3DmpRds
 
         sql = <<~SQL.squish
           SELECT users.id, users.firstname, users.surname, users.email, users.active, i.value orcid,
-            orgs.name org_name, ro.name ror_name, ro.ror_id,
+            orgs.name org_name, ro.name ror_name, ro.ror_id, users.ui_token,
             (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
@@ -50,10 +50,11 @@ module Uc3DmpRds
               AND i.identifier_scheme_id IN (SELECT sch.id FROM identifier_schemes sch WHERE sch.name = 'orcid')
           WHERE users.api_token = :token
         SQL
-        users = ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
+        ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
       end
 
       # Convert the ActiveRecord query results into a JSON object
+      # rubocop:disable Metrics/AbcSize
       def _serialize_user(user:)
         return {} if user.nil? || user['email'].nil?
 
@@ -64,6 +65,7 @@ module Uc3DmpRds
           admin: !user['perm'].nil?,
           active: user.fetch('active', false)
         }
+        hash[:token] = user['ui_token'] unless user['ui_token'].nil?
         hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?
         return hash if user['org_name'].nil?
 
@@ -71,6 +73,7 @@ module Uc3DmpRds
         hash[:affiliation][:affiliation_id] = { type: 'ror', identifier: user['ror_id'] } unless user['ror_id'].nil?
         JSON.parse(hash.to_json)
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Brian Riley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute
@@ -139,7 +139,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: DMPTool gem that provides general support for accessing MySQL DB hosted on
   AWS RDS