From b033db0e55c1090159048609fc44764f5d8732b4 Mon Sep 17 00:00:00 2001
From: Thein Lin Kyaw <theinlinkyaw@code2lab.com>
Date: Sat, 11 Jul 2020 11:16:23 +0630
Subject: [PATCH] fix session_expiry nil

---
 app/controllers/sessions_controller.rb | 2 +-
 app/models/employee.rb                 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 0f6d26d4..f36527c6 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -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
diff --git a/app/models/employee.rb b/app/models/employee.rb
index 3213ca33..58ed7290 100755
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -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