git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix session_expiry nil

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-07-11 11:16:23 +06:30
parent 964389bae3
commit b033db0e55
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/sessions_controller.rb
View File

@@ -37,7 +37,7 @@ class SessionsController < ApplicationController
@login_form = LoginForm.new(settings_home_params) @login_form = LoginForm.new(settings_home_params)
@employee = Employee.login(@login_form.emp_id, @login_form.password) @employee = Employee.login(@login_form.emp_id, @login_form.password)
if @employee != nil if @employee
if @employee.is_active if @employee.is_active
session[:session_token] = @employee.token_session session[:session_token] = @employee.token_session
redirect_to root_path redirect_to root_path

4
app/models/employee.rb
View File

@@ -33,7 +33,6 @@ class Employee < ApplicationRecord
if (user) if (user)
#user.authenticate(password) #user.authenticate(password)
if (user.authenticate(password)) if (user.authenticate(password))
puts user
user.generate_token user.generate_token
user.session_expiry = DateTime.now.utc + expiry_time.minutes user.session_expiry = DateTime.now.utc + expiry_time.minutes
user.session_last_login = DateTime.now.utc user.session_last_login = DateTime.now.utc
@@ -48,8 +47,7 @@ class Employee < ApplicationRecord
if (session_token) if (session_token)
user = Employee.find_by_token_session(session_token) user = Employee.find_by_token_session(session_token)
expiry_time = login_expiry_time expiry_time = login_expiry_time
puts expiry_time if user && user.session_expiry && user.session_expiry.utc > DateTime.now.utc
if user && user.session_expiry.utc > DateTime.now.utc
#Extend the login time each time authenticatation take place #Extend the login time each time authenticatation take place
user.session_expiry = user.session_expiry.utc + expiry_time.minutes user.session_expiry = user.session_expiry.utc + expiry_time.minutes
user.save user.save