web47core 1.0.6 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9275f3f097ae096f3de33a7b387e107d1a0e08fa01ae37d369a22e814db22d
-  data.tar.gz: 3a2080a56ef021eccb2e398ec51f9c1bd474450924c00e1b8a0f82ad6fd13473
+  metadata.gz: 02dd58fcec06a9063b40e442d1d4c038d6674a2a3ca7f8a4376bd8794f596b35
+  data.tar.gz: 47dbe5284b761b4200719157c6df9d46eb6871e2891a5c7de466616bf47a13fd
 SHA512:
-  metadata.gz: 9d7013d8e16ae68be5adfe2f8b38a9536d8acb4fda7b7907f0afe1d41c0fcda941a86bcef4c021d079211907c6a9081cdc22a5744eb6f7042fc94a9169edb0d4
-  data.tar.gz: 36bc38a23ee63292623e95d32035d9b7962ff1070c71f91d424ea62a65393f704bdee0544c9fad97ce0f0f1f2495e700559c5b61f9a9a81401d4e02adb3b19e5
+  metadata.gz: 386b08bbb4ecdddac06239df45e88b2fa55013a2494238d130ac03c9ca81f060a6aa679168601d0adf59ee24c1ad66ff38edc97c84343a2bbca0b519b93ccc31
+  data.tar.gz: eb46d666048b0f2157c705a942b968b5c1e8a211842baca1e92d25d2e13a5bbbcee44a1aea2e7021b28e9d81fa54fc6bfb4d0afaf56b1281a3be1373bf40bb0e

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[priority run_at]).limit(100)
+    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
   end
 
   def show

data/lib/app/jobs/cron/server.rb

@@ -185,7 +185,7 @@ module Cron
     # Returns the AutoScalingGroup associated with the account
     #
     def auto_scaling_group
-      filter = { auto_scaling_group_names: [sys_config.auto_scaling_group_name] }
+      filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
       @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
     end
 

data/lib/app/jobs/cron/trim_collection.rb

@@ -31,12 +31,19 @@ module Cron
     # Test if this should be archived
     #
     def archive?(item)
-      item.updated_at < allowed_time_for_item(item)
+      item.send(comparison_field) < allowed_time_for_item(item)
     rescue StandardError => error
       App47Logger.log_warn "Unable to archive item #{item.inspect}", error
       false
     end
 
+    #
+    # Return which field to use for comparison when trimming objects
+    #
+    def comparison_field
+      :updated_at
+    end
+
     #
     # Try to get a TTL from System configuration, otherwise return the default
     #

data/lib/app/models/concerns/{secure_password.rb → encrypted_password.rb}

@@ -4,7 +4,7 @@
 # The security will lie in the key that is offered by the object. By default it will be the ID of the object
 # however it should really use be combined with some other known value like account.id or something
 #
-module SecurePassword
+module EncryptedPassword
   extend ActiveSupport::Concern
   #
   # Base class extension
@@ -23,7 +23,7 @@ module SecurePassword
   # Retrieve the password
   #
   def password
-    cipher.decrypt_and_verify(encrypted_password)
+    encrypted_password.present? ? cipher.decrypt_and_verify(encrypted_password) : ''
   rescue StandardError => error
     App47Logger.log_warn("Unable to retrieve password for #{inspect}", error)
     nil
@@ -32,8 +32,8 @@ module SecurePassword
   #
   # Set the password
   #
-  def password=(password)
-    set encrypted_password: cipher.encrypt_and_sign(password)
+  def password=(pass)
+    set encrypted_password: cipher.encrypt_and_sign(pass)
   rescue StandardError => error
     App47Logger.log_error("Unable to store password for #{inspect}", error)
     nil

data/lib/app/models/concerns/standard_model.rb

@@ -312,6 +312,7 @@ module StandardModel
   #
   def log_deletion(user, model)
     Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                    deleted_oid: model.id,
                                                     model: model,
                                                     action: AuditLog::DELETE_ACTION,
                                                     changed_values: App47Logger.clean_params(attributes).to_json)

data/lib/app/models/user_model_audit_log.rb

@@ -8,6 +8,7 @@ class UserModelAuditLog < UserAuditLog
   # Fields
   #
   field :changed_values, type: String
+  field :deleted_oid, type: BSON::ObjectId
   #
   # Relationships
   #

data/lib/web47core.rb

@@ -11,7 +11,7 @@ require 'app/models/concerns/switchboard_able'
 require 'app/models/concerns/core_system_configuration'
 require 'app/models/concerns/core_account'
 require 'app/models/concerns/secure_fields'
-require 'app/models/concerns/secure_password'
+require 'app/models/concerns/encrypted_password'
 require 'app/models/delayed_job'
 require 'app/models/redis_configuration'
 require 'app/models/notification'

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.0.6'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.12
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -637,10 +637,10 @@ files:
 - lib/app/models/concerns/core_account.rb
 - lib/app/models/concerns/core_system_configuration.rb
 - lib/app/models/concerns/email_able.rb
+- lib/app/models/concerns/encrypted_password.rb
 - lib/app/models/concerns/role_able.rb
 - lib/app/models/concerns/search_able.rb
 - lib/app/models/concerns/secure_fields.rb
-- lib/app/models/concerns/secure_password.rb
 - lib/app/models/concerns/standard_model.rb
 - lib/app/models/concerns/switchboard_able.rb
 - lib/app/models/concerns/time_zone_able.rb