web47core 3.2.3.28 → 3.2.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae4e8d149eb528b642a281d596ce1d74a3be183c5c4f96973d18fe5feceea51
-  data.tar.gz: b903d5e5875c61111150ead42469abb2ceaf12667d42125949eaf284e5c29661
+  metadata.gz: 2f2f736da8b94ec286fb7f058993c995c47eca9f0b31e32bf9ce836aa77f70c3
+  data.tar.gz: 94a764cdd7e74c7a28d91855b69b646572405d035954f36ef13c0967cf6c3f13
 SHA512:
-  metadata.gz: ab104e17e0c0780a4b8ae5d3359dfde29d5433e9e705105a5babdd515cddb059af97d9d5e8557288d42236e2945c6b15685d5739d60be5f39f56201bdb9098ee
-  data.tar.gz: c8eeee3b4cc1a18a43f3076ed0601c7258481ef4a5b8316f88b12230b5ffb0e53573f7cc321ae6334ec4613b279e9572354f3ab0f24bf196008820da50ddae53
+  metadata.gz: 658278516a6ad09337c857bd2ad2e4fbf1ee32881890d06034d003778dad2cd46ab24934ea8237962f7a1c9d917800a9922f7f338a228b640e520a0c4fcd33fc
+  data.tar.gz: a485be8d18a431e76ff5887ec0e8c739a597cd1fb67c431c7668383e51788c56f05a3b1823477800dea7cc250ded36fe5614c55b88f2b1fe895d1d5950dd6d20

data/app/helpers/core_application_helper.rb

@@ -5,17 +5,25 @@
 #
 module CoreApplicationHelper
   # @abstract Return the current user
-  # @return [User] - The current user that is logged in
+  # @return [User, nil] - The current user that is logged in
   def current_user
     @current_user
   end
 
   # @abstract Return the current member
-  # @return [Member] - The current user that is logged in
+  # @return [Member, nil] - The current user that is logged in
   def current_member
     @current_member
   end
 
+  # @abstract return the user or member depending on configuration
+  # @return [Member, User, nil]
+  def current_member_user
+    send("current_#{Web47core.audit_model}")
+  rescue StandardError
+    current_user || current_member
+  end
+
   # @abstract Return the referrer url without deleting it out of the session
   # @param [String] default_url - The URL to use if the referrer session is not there
   # @return [String] the session[:referrer] or the default_url if not found

data/app/helpers/core_data_grid_helper.rb

@@ -47,7 +47,7 @@ module CoreDataGridHelper
     when Mongoid::Boolean
       value ? 'Yes' : 'No'
     when Date, DateTime, Time
-      current_user.local_time(value, :medium)
+      current_member_user&.local_time(value, :medium) || value.to_s
     when Integer, Array
       value.to_s
     when String

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

@@ -17,7 +17,7 @@ module ApiTokenable
       # call back to reset the api token.
       before_save :assign_api_token, if: :reset_api_token
       # set the index on api token
-      index({ api_token: 1 }, background: true)
+      index({ api_token: Mongo::Index::ASCENDING }, background: true)
 
       def cycle_api_token
         set api_token: SecureRandom.urlsafe_base64

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

@@ -43,6 +43,9 @@ module CoreSystemConfiguration
       #
       validates :environment, presence: true, uniqueness: true
       validates :default_time_zone, presence: true
+      validates :base_url, http_url: true
+      validates :cdn_url, http_url: true
+      validates :asset_cdn_url, http_url: true
     end
     base.extend ClassMethods
   end

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

@@ -18,7 +18,7 @@ module SlackConfiguration
       #
       # Validations
       #
-      validates :slack_api_url, url: true, allow_blank: true
+      validates :slack_api_url, http_url: true, allow_blank: true
       validates :slack_support_channel, presence: true
       validates :slack_sales_channel, presence: true
     end

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

@@ -18,7 +18,7 @@ module SwitchboardConfiguration
       #
       # Validations
       #
-      validates :switchboard_base_url, url: true
+      validates :switchboard_base_url, http_url: true
     end
   end
 

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

@@ -19,7 +19,7 @@ module ZendeskConfiguration
       #
       # Validations
       #
-      validates :zendesk_base_url, url: true
+      validates :zendesk_base_url, http_url: true
     end
   end
 

data/lib/app/validators/http_url_validator.rb

@@ -0,0 +1,20 @@
+# Validator for ensuring that an attribute contains a valid HTTP or HTTPS URL.
+# Uses URI.parse to verify the scheme and the presence of a host.
+class HttpUrlValidator < ActiveModel::EachValidator
+
+  # Validates the format of the URL provided in the attribute.
+  #
+  # @param record [ActiveModel::Model] The record being validated.
+  # @param attribute [Symbol] The name of the attribute being validated.
+  # @param value [Object] The value of the attribute to check.
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    uri = URI.parse(value)
+    return if uri.is_a?(URI::HTTP) && uri.host.present?
+
+    record.errors.add(attribute, "is not a valid URL")
+  rescue URI::InvalidURIError
+    record.errors.add(attribute, "is not a valid URL")
+  end
+end

data/lib/web47core/version.rb

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

data/lib/web47core.rb

@@ -93,3 +93,4 @@ require 'app/controllers/concerns/core_delayed_job_workers_controller'
 # Validators
 #
 require 'app/validators/email_format_validator'
+require 'app/validators/http_url_validator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.28
+  version: 3.2.3.30
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-19 00:00:00.000000000 Z
+date: 2026-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -192,34 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: validate_url
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: valid_url
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
@@ -416,6 +388,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -6621,6 +6607,7 @@ files:
 - lib/app/models/user_audit_log.rb
 - lib/app/models/user_model_audit_log.rb
 - lib/app/validators/email_format_validator.rb
+- lib/app/validators/http_url_validator.rb
 - lib/merge_coverage.rb
 - lib/templates/email/notification_failure.liquid
 - lib/templates/email/notification_failure.subject.liquid