KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: revert GlobalConfig changes (#3702)

Browse source 
Priority to GlobalConfig changes are reverted and for the time being, env vars will take precedence if set.

Fixes #3699
This commit is contained in:
Vishnu Narayanan 2022-01-12 08:50:23 +05:30 committed by GitHub
parent f44be0b1e6
commit acba07cf6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/accounts_controller.rb
View file

@ -55,7 +55,7 @@ class Api::V1::AccountsController < Api::BaseController
end
def check_signup_enabled
raise ActionController::RoutingError, 'Not Found' if GlobalConfig.get_value('ENABLE_ACCOUNT_SIGNUP') == 'false'
raise ActionController::RoutingError, 'Not Found' if GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false') == 'false'
end
def pundit_user

4
lib/global_config_service.rb
View file

@ -1,7 +1,7 @@
class GlobalConfigService
def self.load(config_key, default_value)
config = GlobalConfig.get(config_key)
return config[config_key] if config[config_key].present?
config = ENV[config_key] || GlobalConfig.get(config_key)[config_key]
return config if config.present?
# To support migrating existing instance relying on env variables
# TODO: deprecate this later down the line

71
spec/controllers/api/v1/accounts_controller_spec.rb
View file

@ -5,11 +5,6 @@ RSpec.describe 'Accounts API', type: :request do
let(:email) { Faker::Internet.email }
let(:user_full_name) { Faker::Name.name_with_middle }
before do
# to clear redis cache
GlobalConfig.clear_cache
end
context 'when posting to accounts with correct parameters' do
let(:account_builder) { double }
let(:account) { create(:account) }
@ -20,56 +15,62 @@ RSpec.describe 'Accounts API', type: :request do
end
it 'calls account builder' do
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'nil')
allow(account_builder).to receive(:perform).and_return([user, account])
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
allow(account_builder).to receive(:perform).and_return([user, account])
params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
post api_v1_accounts_url,
params: params,
as: :json
post api_v1_accounts_url,
params: params,
as: :json
expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
end
end
it 'renders error response on invalid params' do
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'nil')
allow(account_builder).to receive(:perform).and_return(nil)
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
allow(account_builder).to receive(:perform).and_return(nil)
params = { account_name: nil, email: nil, user: nil, user_full_name: nil }
params = { account_name: nil, email: nil, user: nil, user_full_name: nil }
post api_v1_accounts_url,
params: params,
as: :json
post api_v1_accounts_url,
params: params,
as: :json
expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response).to have_http_status(:forbidden)
expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response).to have_http_status(:forbidden)
expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
end
end
end
context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to false' do
it 'responds 404 on requests' do
params = { account_name: 'test', email: email, user_full_name: user_full_name, password: 'Password1!' }
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false')
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:not_found)
params = { account_name: 'test', email: email, user_full_name: user_full_name }
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:not_found)
end
end
end
context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to api_only' do
it 'does not respond 404 on requests' do
params = { account_name: 'test', email: email, user_full_name: user_full_name, password: 'Password1!' }
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'api_only')
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:success)
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'api_only' do
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:success)
end
end
end
end

41
spec/lib/global_config_service_spec.rb
View file

@ -10,35 +10,34 @@ describe GlobalConfigService do
GlobalConfig.clear_cache
end
it 'set default value if not found on db nor env var' do
value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq nil
# it 'set default value if not found on db nor env var' do
# value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
# expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq nil
described_class.load('ENABLE_ACCOUNT_SIGNUP', 'true')
# described_class.load('ENABLE_ACCOUNT_SIGNUP', 'true')
value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq 'true'
expect(InstallationConfig.find_by(name: 'ENABLE_ACCOUNT_SIGNUP')&.value).to eq 'true'
end
# value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
# expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq 'true'
# expect(InstallationConfig.find_by(name: 'ENABLE_ACCOUNT_SIGNUP')&.value).to eq 'true'
# end
it 'get value from env variable if not found on DB' do
it 'get value from env variable even if present on DB' do
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
expect(InstallationConfig.find_by(name: 'ENABLE_ACCOUNT_SIGNUP')&.value).to eq nil
described_class.load('ENABLE_ACCOUNT_SIGNUP', 'true')
value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq 'false'
value = described_class.load('ENABLE_ACCOUNT_SIGNUP', 'true')
expect(value).to eq 'false'
end
end
it 'get value from DB if found' do
# Set a value in db first and make sure this value
# is not respected even when load() method is called with
# another value.
InstallationConfig.where(name: 'ENABLE_ACCOUNT_SIGNUP').first_or_create(value: 'true')
described_class.load('ENABLE_ACCOUNT_SIGNUP', 'false')
value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq 'true'
end
# it 'get value from DB if found' do
# # Set a value in db first and make sure this value
# # is not respected even when load() method is called with
# # another value.
# InstallationConfig.where(name: 'ENABLE_ACCOUNT_SIGNUP').first_or_create(value: 'true')
# described_class.load('ENABLE_ACCOUNT_SIGNUP', 'false')
# value = GlobalConfig.get('ENABLE_ACCOUNT_SIGNUP')
# expect(value['ENABLE_ACCOUNT_SIGNUP']).to eq 'true'
# end
end
end
end