Merge branch '15258-wb-report-issue-bugfix'

[arvados.git] / apps / workbench / config / initializers / validate_wb2_url_config.rb

diff --git a/apps/workbench/config/initializers/validate_wb2_url_config.rb b/apps/workbench/config/initializers/validate_wb2_url_config.rb
index 9725e7d971fa90cea2658b21b1fcdfea8e1f5516..0a8f07c4bed0c1bedf3e565ff63b49f4318f847f 100644 (file)
--- a/apps/workbench/config/initializers/validate_wb2_url_config.rb
+++ b/apps/workbench/config/initializers/validate_wb2_url_config.rb
@@ -2,19 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-require 'uri'
+require 'config_validators'
 
-if Rails.configuration.workbench2_url
-    begin
-        if !URI.parse(Rails.configuration.workbench2_url).is_a?(URI::HTTP)
-            Rails.logger.warn("workbench2_url config is not an HTTP URL: #{Rails.configuration.workbench2_url}")
-            Rails.configuration.workbench2_url = false
-        elsif /.*[\/]{2,}$/.match(Rails.configuration.workbench2_url)
-            Rails.logger.warn("workbench2_url config shouldn't have multiple trailing slashes: #{Rails.configuration.workbench2_url}")
-            Rails.configuration.workbench2_url = false
-        end
-    rescue URI::InvalidURIError
-        Rails.logger.warn("workbench2_url config invalid URL: #{Rails.configuration.workbench2_url}")
-        Rails.configuration.workbench2_url = false
-    end
-end
+include ConfigValidators
+
+ConfigValidators::validate_wb2_url_config()
\ No newline at end of file