fix session_expiry nil

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

View File

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

View File

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