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

Code-climate duplicate code fixes (#382)

Browse source 
* Code-climate duplicate code fixes

* Spec for accounts controller
This commit is contained in:
Sojan Jose 2019-12-24 17:32:27 +05:30 • committed by Pranav Raj S
parent 97ab82892d
commit f98cd83a29
5 changed files with 48 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,6 @@
class Api::V1::AccountsController < Api::BaseController
include AuthHelper
skip_before_action :verify_authenticity_token, only: [:create]
skip_before_action :authenticate_user!, :set_current_user, :check_subscription, :handle_with_exception,
only: [:create], raise: false
@ -9,9 +11,9 @@ class Api::V1::AccountsController < Api::BaseController
with: :render_error_response
def create
@user = AccountBuilder.new(params).perform
@user = AccountBuilder.new(account_params).perform
if @user
set_headers(@user)
send_auth_headers(@user)
render json: {
data: @user.token_validation_response
}
@ -22,12 +24,7 @@ class Api::V1::AccountsController < Api::BaseController
private
def set_headers(user)
data = user.create_new_auth_token
response.headers[DeviseTokenAuth.headers_names[:"access-token"]] = data['access-token']
response.headers[DeviseTokenAuth.headers_names[:"token-type"]] = 'Bearer'
response.headers[DeviseTokenAuth.headers_names[:client]] = data['client']
response.headers[DeviseTokenAuth.headers_names[:expiry]] = data['expiry']
response.headers[DeviseTokenAuth.headers_names[:uid]] = data['uid']
def account_params
params.permit(:account_name, :email).to_h
end
end

10
app/controllers/concerns/auth_helper.rb Normal file
View file

@ -0,0 +1,10 @@
module AuthHelper
def send_auth_headers(user)
data = user.create_new_auth_token
response.headers[DeviseTokenAuth.headers_names[:"access-token"]] = data['access-token']
response.headers[DeviseTokenAuth.headers_names[:"token-type"]] = 'Bearer'
response.headers[DeviseTokenAuth.headers_names[:client]] = data['client']
response.headers[DeviseTokenAuth.headers_names[:expiry]] = data['expiry']
response.headers[DeviseTokenAuth.headers_names[:uid]] = data['uid']
end
end

13
app/controllers/passwords_controller.rb
View file

@ -1,4 +1,6 @@
class PasswordsController < Devise::PasswordsController
include AuthHelper
skip_before_action :require_no_authentication, raise: false
skip_before_action :authenticate_user!, raise: false
@ -8,7 +10,7 @@ class PasswordsController < Devise::PasswordsController
reset_password_token = Devise.token_generator.digest(self, :reset_password_token, original_token)
@recoverable = User.find_by(reset_password_token: reset_password_token)
if @recoverable && reset_password_and_confirmation(@recoverable)
set_headers(@recoverable)
send_auth_headers(@recoverable)
render json: {
data: @recoverable.token_validation_response
}
@ -29,15 +31,6 @@ class PasswordsController < Devise::PasswordsController
protected
def set_headers(user)
data = user.create_new_auth_token
response.headers[DeviseTokenAuth.headers_names[:"access-token"]] = data['access-token']
response.headers[DeviseTokenAuth.headers_names[:"token-type"]] = 'Bearer'
response.headers[DeviseTokenAuth.headers_names[:client]] = data['client']
response.headers[DeviseTokenAuth.headers_names[:expiry]] = data['expiry']
response.headers[DeviseTokenAuth.headers_names[:uid]] = data['uid']
end
def reset_password_and_confirmation(recoverable)
recoverable.confirm unless recoverable.confirmed? # confirm if user resets password without confirming anytime before
recoverable.reset_password(params[:password], params[:password_confirmation])