menu and menu item categories

app/models/employee.rb

@@ -8,40 +8,49 @@ class Employee < ApplicationRecord
 
 
   def self.login(emp_id, password)
-    user = Employee.find_by_emp_id(emp_id).authenticate(password)
-
-    Rails.logger.debug user
-
+    user = Employee.find_by_emp_id(emp_id)
     if (user)
-      user.generate_token
-      user.session_expiry = DateTime.now.utc + 30.minutes
-      user.session_last_login = DateTime.now.utc
-      user.save
+      user.authenticate(password)
 
-      return user
+      if (user)
+        user.generate_token
+        user.session_expiry = DateTime.now.utc + 30.minutes
+        user.session_last_login = DateTime.now.utc
+        user.save
+        return user
+      end
     end
+
+
     return nil
 
   end
 
   def self.authenticate_by_token(session_token)
-    user = Employee.find_by_token_session(session_token)
-    if user && user.session_expiry.utc > DateTime.now.utc
-      #Extend the login time each time authenticatation take place
-      user.session_expiry = DateTime.now.utc + 30.minutes
-      user.save
-      return true
-    else
-      return false
+
+    if (session_token)
+      user = Employee.find_by_token_session(session_token)
+      if user && user.session_expiry.utc > DateTime.now.utc
+        #Extend the login time each time authenticatation take place
+        user.session_expiry = DateTime.now.utc + 30.minutes
+        user.save
+        return true
+      else
+        return false
+      end
     end
+
+    return false
   end
 
   def self.logout(session_token)
-    user = Employee.find_by_token_session(session_token)
-    if user
-      user.token_session = nil
-      user.session_expiry = nil
-      user.save
+    if (session_token)
+      user = Employee.find_by_token_session(session_token)
+      if user
+        user.token_session = nil
+        user.session_expiry = nil
+        user.save
+      end
     end
   end