license and local move to base action and update other base

This commit is contained in:
Yan
2018-02-27 11:41:24 +06:30
parent 13b7b1f800
commit ac470c5747
9 changed files with 77 additions and 64 deletions

View File

@@ -2,8 +2,8 @@ module LoginVerification
extend ActiveSupport::Concern
included do
before_action :authenticate
helper_method :current_company,:current_login_employee
before_action :authenticate_session_token
helper_method :current_company, :current_login_employee, :current_user, :get_cashier
end
#this is base api base controller to need to inherit.
@@ -15,16 +15,24 @@ module LoginVerification
rescue
return nil
end
end
def current_login_employee
@employee = Employee.find_by_token_session(session[:session_token])
end
def current_user
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end
# Get current Cashiers
def get_cashier
@cashier = Employee.where("role = 'cashier' AND token_session <> ''")
end
protected
# Authenticate the user with token based authentication
def authenticate
def authenticate
authenticate_session_token || render_unauthorized
end
@@ -38,9 +46,9 @@ module LoginVerification
if @user
return true
#Maybe log - login?
else
flash[:notice] = 'Invalid Access!'
# return false
# else
# flash[:notice] = 'Invalid Access!'
# # return false
end
end
end