made web-functions return json objects

Author: crreinschild

auth.arc

@@ -16,7 +16,7 @@
 ; creates a new user object that contains the username. Passwords
 ; and other related information should be added later.
 (def add-user (name)
-  (if (find-user name) (prn "User exists...")
+  (if (find-user name) -1
       (let u (inst 'user 'name name)
 	(= (users* u!id) u)
 	(= (objects* u!id) u)
@@ -35,8 +35,10 @@
 ; NOTE: Probably not needed.
 (def register (name pass)
   (let id (add-user name)
-    (set-pw id pass)
-    id))
+    (if (is id -1) 
+      nil
+      (do (set-pw id pass)
+          (obj "name" users*.id!name "id" id)))))
 
 ; login
 ; Function that will return a session id upon successfully
@@ -47,7 +49,7 @@
   (let u (find-user name)
     (if u 
       (if (is u!pw pass)
-        (setSessionID u!id)
+        (do (setSessionID u!id) (obj "id" u!id "sessionID" u!sessionID))
         nil)
       nil)))
 

srv.arc

@@ -2,18 +2,12 @@
 ; with GET and POST calls. 
 
 (def web-login (req)
-  (let sid (login (arg req "username") (arg req "password"))
-    (pr "{\"success\":")
-    (if sid 
-      (do
-        (pr "true")
-        (pr ",\"sessionID\":" sid))
-      (pr "false"))
-    (pr "}")))
+  (let info (login (arg req "username") (arg req "password"))
+    (pr (tostring (write-json info)))))
 
 (def web-register (req)
-  (register (arg req "username") (arg req "password"))
-  (pr "main"))
+  (let info (register (arg req "username") (arg req "password"))
+    (pr (tostring (write-json info)))))
 
 (defop api-admin-getUsers req
   (pr "{\"list\":\"" (listUsers) "\"}"))

static/metagame.js

@@ -36,6 +36,23 @@ $(document).ready( function () {
       }
     });
   });
+  
+  $('input[name=register_button]').bind("click", function(event) {
+    event.preventDefault();
+    var url = $('input[name=fnid]').val();
+    
+    $.ajax({
+      type: 'post',
+      url: "x?fnid="+url,
+      data: {
+        username: $('input[name=register_username]').val(),
+        password: $('input[name=register_password]').val()
+      },
+      success: function (data) {
+        console.log(data);
+      }
+    });
+  });
 
 });
 

web.arc

@@ -30,7 +30,9 @@
       (add-js "metagame.js"))
     (tag (body)
       (tag (div)
-        (register-prompt)))))
+        (register-prompt))
+      (tag (div)
+        (link "Go back to main page" "main")))))
 
 
 ; Various HTML printing functions
@@ -51,7 +53,7 @@
     (link "Register" "register")))
 
 (def register-prompt ()
-  (arform web-register
+  (aform web-register
     (myinput "text" "register_username")
     (myinput "password" "register_password")
     (but "Register" "register_button")))