diff --git a/app/models/auth_provider.rb b/app/models/auth_provider.rb index 756982709..36b27ea95 100644 --- a/app/models/auth_provider.rb +++ b/app/models/auth_provider.rb @@ -13,7 +13,7 @@ class AuthProvider < ApplicationRecord end def strategy_name - "database-#{name.downcase.parameterize}" + 'database-simpleauthprovider' end end diff --git a/lib/provider_config.rb b/lib/provider_config.rb index 385cdd065..4890435d0 100644 --- a/lib/provider_config.rb +++ b/lib/provider_config.rb @@ -3,7 +3,11 @@ # Deals with the yml file keeping the configuration of the current authentication provider class ProviderConfig def initialize - @config = YAML.safe_load_file('config/auth_provider.yml').with_indifferent_access if File.exist?('config/auth_provider.yml') + @config = if File.exist?('config/auth_provider.yml') + YAML.safe_load_file('config/auth_provider.yml').with_indifferent_access + else + { providable_type: 'DatabaseProvider', name: 'DatabaseProvider::SimpleAuthProvider' } + end end def db diff --git a/scripts/mount-auth-provider.sh b/scripts/mount-auth-provider.sh index cdf063ea3..cb1b8dd67 100644 --- a/scripts/mount-auth-provider.sh +++ b/scripts/mount-auth-provider.sh @@ -22,7 +22,7 @@ add_mount() if [[ ! $(yq eval ".services.$SERVICE.volumes.[] | select (. == \"*auth_provider.yml\")" docker-compose.yml) ]]; then # change docker-compose.yml permissions for fix yq can't modify file issue chmod 666 docker-compose.yml - yq -i eval ".services.$SERVICE.volumes += [\"\./config/auth_provider.yml:/usr/src/app/auth_provider.yml\"]" docker-compose.yml + yq -i eval ".services.$SERVICE.volumes += [\"./config/auth_provider.yml:/usr/src/app/auth_provider.yml\"]" docker-compose.yml chmod 644 docker-compose.yml fi }