diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb index f179c6405..32fb5c44b 100644 --- a/app/builders/account_builder.rb +++ b/app/builders/account_builder.rb @@ -2,7 +2,7 @@ class AccountBuilder include CustomExceptions::Account - pattr_initialize [:account_name, :email!, :confirmed, :user, :user_full_name, :user_password, :super_admin, :locale] + pattr_initialize [:email!, :confirmed, :user, :user_password, :super_admin, :locale] def perform if @user.nil? @@ -49,7 +49,7 @@ class AccountBuilder end def create_account - @account = Account.create!(name: account_name, locale: I18n.locale) + @account = Account.create!(name: '', locale: I18n.locale) Current.account = @account end @@ -74,7 +74,7 @@ class AccountBuilder @user = User.new(email: @email, password: user_password, password_confirmation: user_password, - name: user_full_name) + name: '') @user.type = 'SuperAdmin' if @super_admin @user.confirm if @confirmed @user.save! diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index 481594ee4..0d4ad36b7 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -23,8 +23,6 @@ class Api::V1::AccountsController < Api::BaseController def create @user, @account = AccountBuilder.new( - account_name: account_params[:account_name], - user_full_name: account_params[:user_full_name], email: account_params[:email], user_password: account_params[:password], locale: account_params[:locale], diff --git a/app/models/user.rb b/app/models/user.rb index ba638f637..a8467aafc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -68,8 +68,6 @@ class User < ApplicationRecord # work because :validatable in devise overrides this. # validates_uniqueness_of :email, scope: :account_id - validates :email, presence: true - has_many :account_users, dependent: :destroy_async has_many :accounts, through: :account_users accepts_nested_attributes_for :account_users