stuff

1 files changed, 16 insertions, 26 deletions

diff --git a/lisp/service/login-service.lisp b/lisp/service/login-service.lisp
index a4ff93c..dfd2929 100644
--- a/lisp/service/login-service.lisp
+++ b/lisp/service/login-service.lisp
@@ -12,38 +12,28 @@
           :accessor title))
   (:documentation ""))
 
-(defclass login-forgot-service (login-service)
-  ()
+(defclass login-authenticate-service (rest-service)
+  ((location-p :initform nil))
   (:documentation ""))
 
-(defmethod initialize-instance :after ((login-service login-service) &key)
-  (setf (title login-service) "Login")
-  (setf (form login-service) (make-form "login-form"
-                                        nil
-                                        t
-                                        '((:name "username" :label "Username" :field-type "text" :required "required")
-                                          (:name "pwd" :label "Password" :field-type "password" :required "required")
-                                          (:label "Login" :field-type "button" :onclick "on_login_submit_clicked()")))))
-
-(defmethod initialize-instance :after ((login-forgot-service login-forgot-service) &key)
-  (setf (title login-forgot-service) "Reset Password")
-  (setf (form login-forgot-service) (make-form "login-forgot-form"
-                                               nil
-                                               t
-                                               '((:name "username" :label "Username" :field-type "text" :required "required")
-                                                 (:label "Send password reset email" :field-type "button" :onclick "on-login-forgot-submit-clicked")))))
-
 (defun login-json ()
   (with-noauth (instance login-service)
-    t))
+    (setf (title instance) "Login")
+    (setf (form instance) (make-form "login-form"
+                                     nil
+                                     t
+                                     '((:name "username" :label "Username" :field-type "text" :required "required")
+                                       (:name "pwd" :label "Password" :field-type "password" :required "required")
+                                       (:label "Login" :field-type "button" :onclick "on_login_submit_clicked()"))))))
 
 (defun login-forgot-json ()
-  (with-noauth (instance login-forgot-service)
-    t))
-
-(defclass login-authenticate-service (rest-service)
-  ((location-p :initform nil))
-  (:documentation ""))
+  (with-noauth (instance login-service)
+    (setf (title instance) "Reset Password")
+    (setf (form instance) (make-form "login-forgot-form"
+                                     nil
+                                     t
+                                     '((:name "username" :label "Username" :field-type "text" :required "required")
+                                       (:label "Send password reset email" :field-type "button" :onclick "on-login-forgot-submit-clicked"))))))
 
 (defun login-authenticate-json (username pwd)
   (with-noauth (instance login-authenticate-service)