1 files changed, 95 insertions, 32 deletions
diff --git a/src/jqueryRest.js b/src/jqueryRest.js
index 54a0908..bfa4592 100644
--- a/src/jqueryRest.js
+++ b/src/jqueryRest.js
@@ -1,38 +1,101 @@
-jqueryRest = function() {
+srp.remote = (function(){
+  var jqueryRest = (function() {
 
-  // we do not fetch the salt from the server
-  function register(session, callback)
-  {
-    sendVerifier(session, callback);
-  }
+    // TODO: Do we need to differentiate between PUT and POST?
+    function register(session) {
+      return $.post("/users.json", {user: session.signup() });
+    }
 
-  function sendVerifier(session, callback) {
-    var salt = session.getSalt();
-    $.post("users.json", { user:
-      { login: session.getI(),
-        password_salt: salt,
-        password_verifier: session.getV(salt).toString(16)}
-    }, callback);
-  }
+    function update(url, session) {
+      return $.ajax({
+        url: url,
+        type: 'PUT',
+        data: {user: session.signup() }
+      });
+    }
 
-  function handshake(session, callback) {
-    $.post("sessions.json", { login: session.getI(),
-      A: session.getAstr()}, callback);
-  }
+    function handshake(session) {
+      return $.post("/sessions.json", session.handshake());
+    }
 
-  function authenticate(session, success) {
-    $.ajax({
-      url: "sessions/" + session.getI() + ".json",
-      type: 'PUT',
-      data: {client_auth: session.getM()},
-      success: success
-    });
-  }
+    function authenticate(session) {
+      return $.ajax({
+        url: "/sessions/" + session.getI() + ".json",
+        type: 'PUT',
+        data: {client_auth: session.getM()}
+      });
+    }
 
-  return {
-    register: register,
-    register_send_verifier: sendVerifier,
-    handshake: handshake,
-    authenticate: authenticate
+    return {
+      register: register,
+      update: update,
+      handshake: handshake,
+      authenticate: authenticate
+    };
+  }());
+
+
+  function signup(){
+    jqueryRest.register(srp.session)
+    .done(srp.signedUp)
+    .fail(error)
+  };
+
+  function update(submitEvent){
+    var form = submitEvent.target;
+    jqueryRest.update(form.action, srp.session)
+    .done(srp.updated)
+    .fail(error)
+  };
+
+  function login(){
+    jqueryRest.handshake(srp.session)
+    .done(receiveSalts)
+    .fail(error)
   };
-};
+
+  function receiveSalts(response){
+    // B = 0 will make the algorithm always succeed
+    // -> refuse such a server answer
+    if(response.B === 0) {
+      srp.error("Server send random number 0 - could not login.");
+    }
+    else if(! response.salt || response.salt === 0) {
+      srp.error("Server failed to send salt - could not login.");
+    } 
+    else 
+    {
+      srp.session.calculations(response.salt, response.B);
+      jqueryRest.authenticate(srp.session)
+      .done(confirmAuthentication)
+      .fail(error);
+    }
+  };
+
+  // Receive M2 from the server and verify it
+  // If an error occurs, raise it as an alert.
+  function confirmAuthentication(response)
+  {
+    if (srp.session.validate(response.M2))
+      srp.loggedIn();
+    else
+      srp.error("Server key does not match");
+  };
+
+  // The server will send error messages as json alongside
+  // the http error response.
+  function error(xhr, text, thrown)
+  { 
+    if (xhr.responseText && xhr.responseText != "")
+      srp.error($.parseJSON(xhr.responseText));
+    else
+      srp.error("Server did not respond.");
+  };
+
+  return {
+    signup: signup,
+    update: update,
+    login: login
+  }
+
+}());