96efc44b82
* Chore: Feature lock email settings in UI The email settings under account settings needed to be feature locked in a way different from teh current way for it to be enabled for accounts in a self hosted scenario. Some refactorings were also done along with this change. 1. There was a feature flag defined in code in account model called domain_emails_enabled was used to check if the inbound emails was enabled for the account. But there was already a feature flag called "inbound_emails" defined in features.yml. So changed to use this to check if inbound emails are enabled for an account. 2. Renamed and re-purposed existing `domain_emails_enabled` to `custom_email_domain_enabled` to use for feature toggling the UI for email settings. 3. To enable & disable multiple features using the featurable concern we were passing an array of values. Changed this to accept a comma separated set of values. * Chore: Feature lock email settings in UI Fixed the specs for accounts controller & removed unneccessary code from Account seetings component in UI * Chore: Convert newlines to <br>s Removed the layout used while sending replies in conversation continuity. Converted the newlines in the messages to <br/> tags for the correct HTML rendering. * Chore: Bug fix in reply email domain Renamed the function custom_email_domain_enabled to inbound_email_enabled. Fixed bug on setting reply emails's domain.
74 lines
2 KiB
Ruby
74 lines
2 KiB
Ruby
class Api::V1::AccountsController < Api::BaseController
|
|
include AuthHelper
|
|
|
|
skip_before_action :verify_authenticity_token, only: [:create]
|
|
skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
|
|
only: [:create], raise: false
|
|
before_action :check_signup_enabled, only: [:create]
|
|
before_action :fetch_account, except: [:create]
|
|
before_action :check_authorization, except: [:create]
|
|
|
|
rescue_from CustomExceptions::Account::InvalidEmail,
|
|
CustomExceptions::Account::UserExists,
|
|
CustomExceptions::Account::UserErrors,
|
|
with: :render_error_response
|
|
|
|
def create
|
|
@user = AccountBuilder.new(
|
|
account_name: account_params[:account_name],
|
|
email: account_params[:email],
|
|
confirmed: confirmed?
|
|
).perform
|
|
if @user
|
|
send_auth_headers(@user)
|
|
render partial: 'devise/auth.json', locals: { resource: @user }
|
|
else
|
|
render_error_response(CustomExceptions::Account::SignupFailed.new({}))
|
|
end
|
|
end
|
|
|
|
def show
|
|
render 'api/v1/accounts/show.json'
|
|
end
|
|
|
|
def update
|
|
@account.update!(account_params.slice(:name, :locale, :domain, :support_email))
|
|
end
|
|
|
|
def update_active_at
|
|
@current_account_user.active_at = Time.now.utc
|
|
@current_account_user.save!
|
|
head :ok
|
|
end
|
|
|
|
private
|
|
|
|
def check_authorization
|
|
authorize(Account)
|
|
end
|
|
|
|
def confirmed?
|
|
super_admin? && params[:confirmed]
|
|
end
|
|
|
|
def fetch_account
|
|
@account = current_user.accounts.find(params[:id])
|
|
@current_account_user = @account.account_users.find_by(user_id: current_user.id)
|
|
end
|
|
|
|
def account_params
|
|
params.permit(:account_name, :email, :name, :locale, :domain, :support_email)
|
|
end
|
|
|
|
def check_signup_enabled
|
|
raise ActionController::RoutingError, 'Not Found' if ENV.fetch('ENABLE_ACCOUNT_SIGNUP', true) == 'false'
|
|
end
|
|
|
|
def pundit_user
|
|
{
|
|
user: current_user,
|
|
account: @account,
|
|
account_user: @current_account_user
|
|
}
|
|
end
|
|
end
|