registration fixes

2 files changed, 31 insertions, 40 deletions

diff --git a/lisp/service/users-service.lisp b/lisp/service/users-service.lisp
index 965fee6..78cf065 100644
--- a/lisp/service/users-service.lisp
+++ b/lisp/service/users-service.lisp
@@ -76,7 +76,7 @@
           (setf registration (get-registration-by-id auth-pkg id)))
         (handler-case
             (let ((text-message (format nil
-                                        "Hello ~a ~a and welcome to the ~a website!~%~%A user account registration has been created for you. It expires in 3 days.~%~%Please click the following link to complete the registration:~%~%~a://~a/register/~a~%"
+                                        "Hello ~a ~a and welcome to the ~a website!~%~%A user account registration has been created for you. It expires in 3 days.~%~%Please click the following link to complete the registration:~%~%~a://~a/register?hash=~a~%"
                                         (name *webapp*)
                                         (first_name registration)
                                         (last_name registration)
@@ -170,30 +170,29 @@
             registration)
         (registrations-gc auth-pkg)
         (setf registration (get-registration-by-hash auth-pkg hash))
-        (org-ckons-json::objects-to-json
-         `(,(if registration
-                (if (string= pwd pwd2)
-                    (let ((user (make-instance 'user
-                                               :username username
-                                               :pwd pwd
-                                               :first_name (first_name registration)
-                                               :last_name (last_name registration)
-                                               :email (email registration)
-                                               :phone phone
-                                               :active t)))
-                      (if (insert-user auth-pkg user)
-                          (progn
-                            (loop for role-group in (union '("profile-admin")
-                                                           (cl-ppcre:split "\\|" (role_groups registration))
-                                                           :test 'string=)
-                                  do (insert-user-role-group auth-pkg (make-instance 'user-role
-                                                                                     :user_id (id user)
-                                                                                     :role_group_name role-group)))
-                            (delete-registration auth-pkg hash)
-                            (setf (session-value :message) "Registration completed successfully."))
-                          (setf (session-value :errormsg) "Error while completing registration.")))
-                    (setf (session-value :errormsg) "Error: passwords do not match."))
-                (setf (session-value :errormsg) "Error while completing registration."))))))))
+        (if registration
+            (if (string= pwd pwd2)
+                (let ((user (make-instance 'user
+                                           :username username
+                                           :pwd pwd
+                                           :first_name (first_name registration)
+                                           :last_name (last_name registration)
+                                           :email (email registration)
+                                           :phone phone
+                                           :active t)))
+                  (if (insert-user auth-pkg user)
+                      (progn
+                        (loop for role-group in (union '("profile-admin")
+                                                       (cl-ppcre:split "\\|" (role_groups registration))
+                                                       :test 'string=)
+                              do (insert-user-role-group auth-pkg (make-instance 'user-role
+                                                                                 :user_id (id user)
+                                                                                 :role_group_name role-group)))
+                        (delete-registration auth-pkg hash)
+                        (setf (session-value :message) "Registration completed successfully."))
+                      (setf (session-value :errormsg) "Error while completing registration.")))
+                (setf (session-value :errormsg) "Error: passwords do not match."))
+            (setf (session-value :errormsg) "Error while completing registration."))))))
 
 (defclass users/modify-service (users/add-service)
   ()
diff --git a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
index 1551957..fdba0f2 100644
--- a/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
+++ b/lisp/webapps/resume/clojurescript/resume/src/resume/core.cljs
@@ -32,7 +32,6 @@
 (declare reset-users-add-state)
 (declare reset-users-register-state)
 (declare reset-users-register-form-state)
-(declare reset-users-register-submit-state)
 (declare reset-users-modify-state)
 (declare date-sql-to-pretty)
 (declare markdown-to-html)
@@ -130,7 +129,6 @@
 (declare handler-users-register-form-impl)
 (declare render-users-register-form)
 (declare on-users-register-submit-clicked)
-(declare comp-users-register-submit)
 (declare handler-users-register-submit)
 (declare render-users-register-submit)
 (declare on-users-modify-clicked)
@@ -181,7 +179,6 @@
 (def users-add-state (r/atom {}))
 (def users-register-state (r/atom {}))
 (def users-register-form-state (r/atom {}))
-(def users-register-submit-state (r/atom {}))
 (def users-modify-state (r/atom {}))
 (def menu-hooks (atom {}))
 
@@ -246,9 +243,6 @@
 (defn reset-users-register-form-state [jsonobj]
   (reset! users-register-form-state jsonobj))
 
-(defn reset-users-register-submit-state [jsonobj]
-  (reset! users-register-submit-state jsonobj))
-
 (defn reset-users-modify-state [jsonobj]
   (reset! users-modify-state jsonobj))
 
@@ -940,13 +934,14 @@
 ;; users-register
 
 (defn comp-users-register []
-  [:div {:style {:display (cond (or (= @location-state "/register")) "block" :else "none")}}
-   [:h3 {:style {:style "text-align: center"}} (get @users-register-state "title")]
+  [:div {:style {:display (cond (or (= @location-state "/users/register")) "block" :else "none")}}
+   [:h3 {:style {:text-align "center"}} (get @users-register-state "title")]
    [comp-users-register-form]])
 
 (defn handler-users-register [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
-    (reset-users-register-state jsonobj)))
+    (reset-users-register-state jsonobj)
+    (render-users-register-form (get jsonobj "hash"))))
 
 (defn render-users-register [hash]
   (POST "/users/register"
@@ -988,15 +983,10 @@
             (.checkValidity))
     (render-users-register-submit)))
 
-(defn comp-users-register-submit []
-  [:div
-   [:a {:href (str "javascript:" (namespace ::x) ".reset_app()")}
-    "Click here to start using the website!"]])
-
 (defn handler-users-register-submit [response]
   (let [jsonobj (js->clj (js/JSON.parse response))]
     (notifications jsonobj)
-    (reset-users-register-submit-state jsonobj)))
+    (reset-app)))
 
 (defn render-users-register-submit []
   (POST "/users/register/submit"
@@ -1096,6 +1086,7 @@
 (push-menu-hook {:handler "/contact-us" :func #(render-contact-us)})
 (push-menu-hook {:handler "/messages" :func #(render-messages)})
 (push-menu-hook {:handler "/users" :func #(render-users)})
+(push-menu-hook {:handler "/users/register" :func #(render-users)})
 (push-menu-hook {:handler "/resume/resume" :func #(render-resume)})
 (push-menu-hook {:handler "/resume/contactinfo" :func #(render-contactinfo)})
 (push-menu-hook {:handler "/resume/education" :func #(render-education)})
@@ -1157,6 +1148,7 @@
    [comp-contact-us]
    [comp-messages]
    [comp-users]
+   [comp-users-register]
    [:div {:id "footer"}
     [:hr]
     "Carlos Konstanski (970) 294-9708"