uc3-dmp-rds 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4181722f3ac149e1843e0372c04cc326341021eef62df0d52efafbf524fb4876
-  data.tar.gz: 9e561848f90dc6961e89f8b051b6dac8f896d119bf6f4e25e409fcf5ac1f4562
+  metadata.gz: 3091e4b4c758fd05dd75c866ef07a3f43f13daa15c909ee32349161f74b8a32f
+  data.tar.gz: a173d9fa491a0fdb756ec409f8ba0f106e0d155f80a752c23fb9d89964201997
 SHA512:
-  metadata.gz: 439be8d21f8eb86b72d0599e0bcfa89e93c032a372bcf4321462cd83435995a9115433bf533a3b88930c2f641b058eb54df7cdca9e80f85979b8dbd632d5919a
-  data.tar.gz: 6118678a2c94fbd6d871d15403ab17fc4e52434b422fe7bf1b093aa481ab97d41615cd5037a9a032ce230626a72452c01f0ad7fa23728e9c4f6ee934f03a0898
+  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
@@ -24,9 +22,11 @@ module Uc3DmpRds
     MSG_MISSING_CREDENTIALS = 'No username and/or password specified'
     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?
@@ -44,9 +44,11 @@ module Uc3DmpRds
       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)
+      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)

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.9'
+  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.9
+  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: