From bd48744cd1da75ddfcfeb8572eed55368711e9e2 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 2 Oct 2012 14:29:47 +0200
Subject: using jquery for signup post now. login still pending

---
 spec/RestfulSpecRunner.html |  1 +
 spec/specHelper.js          |  2 +-
 src/jqueryRest.js           | 57 ++++++++-------------------------------------
 3 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/spec/RestfulSpecRunner.html b/spec/RestfulSpecRunner.html
index caf7147..913dab8 100644
--- a/spec/RestfulSpecRunner.html
+++ b/spec/RestfulSpecRunner.html
@@ -12,6 +12,7 @@
 
   <script type="text/javascript" src="lib/sinon/sinon-1.3.4.js"></script>
   <script type="text/javascript" src="lib/jasmine-sinon.js"></script>
+  <script type="text/javascript" src="lib/jquery-1.8.2.js"></script>
 
   <!-- the files we are testing... -->
   <script type="text/javascript" src="../lib/SHA256.js"></script>
diff --git a/spec/specHelper.js b/spec/specHelper.js
index 21a0cb7..5db81ad 100644
--- a/spec/specHelper.js
+++ b/spec/specHelper.js
@@ -15,7 +15,7 @@ var specHelper = (function() {
   function expectRequest(url, content) {
     expect(this.requests.length).toBe(1);
     expect(this.requests[0].url).toBe(url);
-    expect(this.requests[0].requestBody).toBe(content);
+    expect(decodeURI(this.requests[0].requestBody)).toBe(content);
   }
 
   function respondXML(content) {
diff --git a/src/jqueryRest.js b/src/jqueryRest.js
index 9e7f72b..a618e87 100644
--- a/src/jqueryRest.js
+++ b/src/jqueryRest.js
@@ -1,48 +1,10 @@
 jqueryRest = function() {
 
-  function getUrl()
-  {
-    return "";
-  }
-
-  function paths(path)
-  {
-    return path;
-  }
-
   // Perform ajax requests at the specified path, with the specified parameters
   // Calling back the specified function.
   function ajaxRequest(relative_path, params, callback)
   {
-    var full_url = this.geturl() + this.paths(relative_path);
-    if( window.XMLHttpRequest) {
-      xhr = new XMLHttpRequest();
-    }
-    else if (window.ActiveXObject){
-      try {
-        xhr = new ActiveXObject("Microsoft.XMLHTTP");
-      } catch (e){}
-    }
-    else
-    {
-      session.error_message("Ajax not supported.");
-      return;
-    }
-    if(xhr){
-      xhr.onreadystatechange = function() {
-        if(xhr.readyState == 4 && xhr.status == 200) {
-          callback(parseResponse());
-        }
-      };
-      xhr.open("POST", full_url, true);
-      xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-      xhr.setRequestHeader("Content-length", params.length);
-      xhr.send(params);
-    }
-    else
-    {
-      session.error_message("Ajax failed.");
-    }        
+    $.post(relative_path, params, callback)
   }
 
   function parseResponse() {
@@ -98,26 +60,27 @@ jqueryRest = function() {
   }
 
   function sendVerifier(session, callback) {
-    this.ajaxRequest("users", "user[login]=" + session.getI() +
-      "&user[password_salt]=" + session.getSalt() +
-      "&user[password_verifier]=" + session.getV().toString(16), callback);
+    var salt = session.getSalt();
+    ajaxRequest("users", { user:
+      { login: session.getI(),
+        password_salt: salt,
+        password_verifier: session.getV(salt).toString(16)}
+    }, callback);
   }
 
   function handshake(I, Astr, callback) {
-    this.ajaxRequest("handshake/", "I="+I+"&A="+Astr, callback);
+    ajaxRequest("handshake/", "I="+I+"&A="+Astr, callback);
   }
 
   function authenticate(M, callback) {
-    this.ajaxRequest("authenticate/", "M="+M, callback);
+    ajaxRequest("authenticate/", "M="+M, callback);
   }
 
   function upgrade(M, callback) {
-    this.ajaxRequest("upgrade/authenticate/", "M="+M, callback);
+    ajaxRequest("upgrade/authenticate/", "M="+M, callback);
   }
 
   return {
-    geturl: getUrl,
-    paths: paths,
     ajaxRequest: ajaxRequest,
     register: register,
     register_send_verifier: sendVerifier,
-- 
cgit v1.2.3