diff options
Diffstat (limited to 'service/login-service.lisp')
| -rw-r--r-- | service/login-service.lisp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/service/login-service.lisp b/service/login-service.lisp index 10e0722..a911c49 100644 --- a/service/login-service.lisp +++ b/service/login-service.lisp @@ -22,22 +22,22 @@ (:label "Login" :field-type "button" :onclick "on_login_submit_clicked()"))))) (defun login-json () - (org-ckons-json::objects-to-json `(,(make-instance 'login-service)))) + (with-noauth (instance login-service) + nil)) (defclass login-authenticate-service (rest-service) - ((location-p :initarg :location-p - :initform nil - :accessor location-p)) + ((location-p :initform nil)) (:documentation "")) -(defmethod initialize-instance :after ((login-authenticate-service login-authenticate-service) &key auth-result) - (if auth-result - (setf (message login-authenticate-service) "Successfully logged in.") - (setf (errormsg login-authenticate-service) "Login failed."))) - (defun login-authenticate-json (dn password) - (let ((auth-result nil)) - (when (check-ldap-password (ldap *webapp*) dn password) - (setf (session-value :permissions) "admin") - (setf auth-result t)) - (org-ckons-json::objects-to-json `(,(make-instance 'login-authenticate-service :auth-result auth-result))))) + (with-noauth (instance login-authenticate-service) + (cond ((check-ldap-password (ldap *webapp*) dn password) + (setf (session-value :permissions) "admin") + (setf (session-value :message) "Successfully logged in.") + (setf (session-value :errormsg) 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)))) + |