uc3-dmp-rds 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ceba0e24d5a6a925fde46a68d7d8f1586aa29bf1687e94000d989f6ab522e3e
-  data.tar.gz: 0d6ef838acd8ce79e5638e83b45c8bbdb72cd919863916ad0d48d5658ab079b8
+  metadata.gz: 3091e4b4c758fd05dd75c866ef07a3f43f13daa15c909ee32349161f74b8a32f
+  data.tar.gz: a173d9fa491a0fdb756ec409f8ba0f106e0d155f80a752c23fb9d89964201997
 SHA512:
-  metadata.gz: 7aa9e392a307c55483d432c487ef5a5c0ab6c501e7e3081646f5945ba7fe5322fd29b2eb1d3b81d110f94db0ec252f624fcdcf70a4f903df0cdc434e2851b99b
-  data.tar.gz: 2ced3df663f4dc6ee3d360625ff12c3a267c9a136c1d9535a54a41d51092691a7e8e316ec39fb8eca207b98807abc623f0a47bcaacbca3dd6c55275997211fba
+  metadata.gz: c762ea939a7536dc10e0a551fe3d8ab6dda43944e59e5a84f32fdcdc9af06712ee4baef7b54e99ed253a99f38cdd12ec39630af990f46cc4957f7189a00c5d4b
+  data.tar.gz: e82053a5d6a44958f7f08d965493dfa4045f36ab7d5e6735f8cc0fabc013c7d1531af879dc4ad4fd83934602f50a6ef5c67f8a7c6ca8c25bfc88248391236e03

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

@@ -2,8 +2,6 @@
 
 require 'active_record'
 require 'active_record_simple_execute'
-require 'aws-sdk-sns'
-require 'aws-sdk-ssm'
 require 'mysql2'
 
 module Uc3DmpRds
@@ -22,16 +20,17 @@ module Uc3DmpRds
   class Adapter
     MSG_KEYWORDS_INVALID = 'The parameters specified do not match those in the SQL query'
     MSG_MISSING_CREDENTIALS = 'No username and/or password specified'
-    MSG_NO_CONNECTION = 'No current database connection. Call Uc3DmpRds.connect first'
+    MSG_UNABLE_TO_CONNECT = 'Unable to establish a connection'
+    MSG_UNABLE_TO_QUERY = 'Unable to process the query'
+    MSG_UNAUTHORIZED = 'You are not authorized to perform that action'
 
     class << self
       # Connect to the RDS instance
+      # rubocop:disable Metrics/AbcSize
       def connect(username:, password:)
         raise AdapterError, MSG_MISSING_CREDENTIALS if username.nil? || username.to_s.strip.empty? ||
                                                        password.nil? || password.to_s.strip.empty?
 
-puts "CONNECT - host: #{ENV['DATABASE_HOST']}, port: #{ENV['DATABASE_PORT']}, name: #{ENV['DATABASE_NAME']}, username: #{username}, password.lenght: #{password.length}"
-
         connection = ActiveRecord::Base.establish_connection(
           adapter: 'mysql2',
           host: ENV.fetch('DATABASE_HOST', nil),
@@ -41,21 +40,22 @@ puts "CONNECT - host: #{ENV['DATABASE_HOST']}, port: #{ENV['DATABASE_PORT']}, na
           password: password,
           encoding: 'utf8mb4'
         )
-
-puts connection.inspect
-puts "CONNECTED? #{ActiveRecord::Base.connected?}"
-
-        ActiveRecord::Base.connected?
+        !connection.nil?
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_CONNECT} - #{e.message}"
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Execute the specified query using ActiveRecord's helpers to sanitize the input
-      def execute_query(sql:, **params)
-        raise AdapterError, MSG_NO_CONNECTION unless ActiveRecord::Base.connected?
+      def execute_query(user:, sql:, **params)
+        raise AdapterError, MSG_UNAUTHORIZED unless user.is_a?(User)
         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)
 
         ActiveRecord::Base.simple_execute(sql, params)
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_QUERY} - #{e.message}"
       end
 
       private

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'active_record'
+require 'active_record_simple_execute'
+require 'mysql2'
+
+module Uc3DmpRds
+  # Error from the Rds Adapter
+  class AuthenticatorError < StandardError; end
+
+  # Use Rails' ActiveResource to communicate with the DMPHub REST API
+  class Authenticator
+    MSG_INVALID_TOKEN = 'Invalid user token'
+    MSG_INACTIVE_USER = 'User is inactive'
+
+    class << self
+      def authenticate(token:)
+        raise AuthenticatorError, MSG_INVALID_TOKEN if token.nil? || token.to_s.strip.empty?
+
+        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
+          FROM users
+            INNER JOIN orgs ON users.org_id = orgs.id
+            LEFT OUTER JOIN registry_orgs ro
+              ON orgs.id = ro.org_id
+            LEFT OUTER JOIN identifiers i
+              ON i.identifiable_id = users.id
+              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
+        users = ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
+        raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) and users.any?
+
+        user = users.first
+        raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
+
+        hash = { name: [user['surname'], user['firstname']].join(', '), mbox: user['email'] }
+        hash[:user_id] = { type: 'orcid', identifier: user['orcid'] } unless user['orcid'].nil?
+        return hash.to_json 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?
+        hash.to_json
+      end
+    end
+  end
+end

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

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

data/lib/uc3-dmp-rds.rb

@@ -1,11 +1,6 @@
 # rubocop:disable Naming/FileName
 # frozen_string_literal: true
 
-require 'aws-sdk-sns'
-require 'aws-sdk-ssm'
-
-require 'uc3-dmp-api-core'
-
 require 'uc3-dmp-rds/adapter'
 
 # RDS Database adapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-sns
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.60'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.60'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-ssm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.150'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.150'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +132,7 @@ files:
 - README.md
 - lib/uc3-dmp-rds.rb
 - lib/uc3-dmp-rds/adapter.rb
+- lib/uc3-dmp-rds/authenticator.rb
 - lib/uc3-dmp-rds/version.rb
 homepage: https://github.com/CDLUC3/dmp-hub-cfn/blob/main/src/sam/gems/uc3-dmp-rds
 licenses: