update token mismatch

This commit is contained in:
Yan
2018-02-23 15:49:29 +06:30
parent 25a212bb70
commit a6abfb2f49
10 changed files with 21 additions and 27 deletions

View File

@@ -29,6 +29,7 @@ module LicenseVerification
# redirect_to activate_path
# end
end
authenticate_session_token
end
def authenticate_session_token
@@ -38,9 +39,12 @@ module LicenseVerification
#Rails.logger.debug "token - " + token.to_s
@user = Employee.authenticate_by_token(token)
if !@user
if @user
return true
#Maybe log - login?
else
flash[:notice] = 'Invalid Access!'
redirect_to root_path
# return false
end
end
end

View File

@@ -6,6 +6,21 @@ module LoginVerification
helper_method :current_company,:current_login_employee
end
#this is base api base controller to need to inherit.
#all token authentication must be done here
#response format must be set to JSON
def current_company
begin
return Company.first
rescue
return nil
end
end
def current_login_employee
@employee = Employee.find_by_token_session(session[:session_token])
end
protected
# Authenticate the user with token based authentication
@@ -34,23 +49,6 @@ module LoginVerification
redirect_to root_path
end
#this is base api base controller to need to inherit.
#all token authentication must be done here
#response format must be set to JSON
def current_company
begin
return Company.first
rescue
return nil
end
end
def current_login_employee
@employee = Employee.find_by_token_session(session[:session_token])
end
private
def check_license
License.check_license_file