scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-23 23:35:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2511 from okriuchykhin/ok_SCI_4544

Browse source 
Add option for storing Azure app configs in settings using JSON format [SCI-4544]
This commit is contained in:
Alex Kriuchykhin 2020-04-16 14:34:12 +02:00 committed by GitHub
commit d8885c6b6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/application_settings.rb Normal file
View file

@ -0,0 +1,4 @@
# frozen_string_literal: true
class ApplicationSettings < Settings
end

35
config/initializers/azure_ad.rb
View file

@ -34,4 +34,39 @@ Rails.application.configure do
config.x.azure_ad_apps[value][:sign_in_policy] = ENV["#{app_name}_AZURE_AD_SIGN_IN_POLICY"]
end
end
# Checking additional configurations in ApplicationSettings JSON. Key and values should be strings there.
begin
if ApplicationSettings.instance.values['azure_ad_apps']&.is_a?(Array)
config.x.azure_ad_apps ||= HashWithIndifferentAccess.new
settings = ApplicationSettings.instance
settings.values['azure_ad_apps'].each do |azure_ad_app|
app_config = {}
app_id = azure_ad_app['app_id']
Rails.logger.error('No app_id present for the entry in Azure app settings') && next unless app_id
app_config[:iss] = azure_ad_app['iss']
Rails.logger.error("No iss for #{app_id} Azure app") && next unless app_config[:iss]
app_config[:conf_url] = azure_ad_app['conf_url']
Rails.logger.error("No conf_url for #{app_id} Azure app") && next unless app_config[:conf_url]
app_config[:provider] = azure_ad_app['provider_name']
Rails.logger.error("No provider_name for #{app_id} Azure app") && next unless app_config[:provider]
app_config[:enable_sign_in] = azure_ad_app['enable_sign_in'] == 'true'
if app_config[:enable_sign_in]
app_config[:sign_in_label] = azure_ad_app['sign_in_label'] || 'Sign in with Azure AD'
app_config[:auto_link_on_sign_in] = azure_ad_app['auto_link_on_sign_in'] == 'true'
app_config[:sign_in_policy] = azure_ad_app['sign_in_policy'] if azure_ad_app['sign_in_policy']
end
config.x.azure_ad_apps[app_id] = app_config
end
end
rescue ActiveRecord::ActiveRecordError
Rails.logger.info('Not connected to database, skipping additional Azure AD configuration')
end
end