notification cleanup and message marking

1 files changed, 7 insertions, 7 deletions

diff --git a/lisp/service/login-service.lisp b/lisp/service/login-service.lisp
index cedc867..a4ff93c 100644
--- a/lisp/service/login-service.lisp
+++ b/lisp/service/login-service.lisp
@@ -49,19 +49,19 @@
   (with-noauth (instance login-authenticate-service)
     (if (or (org-ckons-core::null-or-empty-p username)
             (org-ckons-core::null-or-empty-p pwd))
-        (setf (session-value :errormsg) "Login failed.")
+        (setf (errormsg instance) "Login failed.")
         (with-resume-database
           (let* ((auth-pkg (make-instance 'auth-pkg))
                  (user (get-active-user-by-username-pwd auth-pkg username pwd)))
             (cond (user
                    (set-user user)
-                   (setf (session-value :message) "Successfully logged in.")
-                   (setf (session-value :errormsg) nil))
+                   (setf (message instance) "Successfully logged in.")
+                   (setf (errormsg instance) nil))
                   (t
-                   (setf (session-value :message) nil)
-                   (setf (session-value :errormsg) "Login failed."))))))
-    (setf (message instance) (session-value :message))
-    (setf (errormsg instance) (session-value :errormsg))))
+                   (setf (message instance) nil)
+                   (setf (errormsg instance) "Login failed."))))))
+    (setf (message instance) (message instance))
+    (setf (errormsg instance) (errormsg instance))))
 
 (define-endpoint ("/login" :method :get) () login-json)
 (define-endpoint ("/login/authenticate" :method :post) (&post (username :parameter-type 'string) (pwd :parameter-type 'string)) login-authenticate-json username pwd)