From 49bfe6ab74229ba4da5342382b87dcd6fca239fa Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 19 Nov 2012 15:58:46 +0100
Subject: works - but not quite what i want. Exposing jqXHR to error function

---
 src/jqueryRest.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/jqueryRest.js')

diff --git a/src/jqueryRest.js b/src/jqueryRest.js
index 54a0908..a7928d5 100644
--- a/src/jqueryRest.js
+++ b/src/jqueryRest.js
@@ -1,31 +1,30 @@
 jqueryRest = function() {
 
   // we do not fetch the salt from the server
-  function register(session, callback)
+  function register(session)
   {
-    sendVerifier(session, callback);
+    return sendVerifier(session);
   }
 
-  function sendVerifier(session, callback) {
+  function sendVerifier(session) {
     var salt = session.getSalt();
-    $.post("users.json", { user:
+    return $.post("users.json", { user:
       { login: session.getI(),
         password_salt: salt,
-        password_verifier: session.getV(salt).toString(16)}
-    }, callback);
+        password_verifier: session.getV(salt).toString(16)
+      }
+    });
   }
 
-  function handshake(session, callback) {
-    $.post("sessions.json", { login: session.getI(),
-      A: session.getAstr()}, callback);
+  function handshake(session) {
+    return $.post("sessions.json", { login: session.getI(), A: session.getAstr()});
   }
 
-  function authenticate(session, success) {
-    $.ajax({
+  function authenticate(session) {
+    return $.ajax({
       url: "sessions/" + session.getI() + ".json",
       type: 'PUT',
       data: {client_auth: session.getM()},
-      success: success
     });
   }
 
-- 
cgit v1.2.3


From 2e365cba5263ec50f10fb074c054ef19adb8f7b0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 19 Nov 2012 17:36:49 +0100
Subject: first step at cleaning up the srp

---
 src/jqueryRest.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'src/jqueryRest.js')

diff --git a/src/jqueryRest.js b/src/jqueryRest.js
index a7928d5..29f737c 100644
--- a/src/jqueryRest.js
+++ b/src/jqueryRest.js
@@ -35,3 +35,53 @@ jqueryRest = function() {
     authenticate: authenticate
   };
 };
+
+srp.remote = (function(){
+
+  function signup(){
+    jqueryRest().register(srp.session)
+    .success(srp.signedUp)
+    .error(srp.error)
+  };
+
+  function login(){
+    jqueryRest().handshake(srp.session)
+    .success(receiveSalts)
+    .error(srp.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)
+      .success(confirmAuthentication)
+      .error(srp.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");
+  };
+
+
+  return {
+    signup: signup,
+    login: login
+  }
+
+}());
-- 
cgit v1.2.3


From 082f859bbdaedf4f03eb85aea9b8f88ffda2fe6d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 19 Nov 2012 18:11:20 +0100
Subject: further cleanup

---
 src/jqueryRest.js | 62 ++++++++++++++++++++++---------------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

(limited to 'src/jqueryRest.js')

diff --git a/src/jqueryRest.js b/src/jqueryRest.js
index 29f737c..c439f67 100644
--- a/src/jqueryRest.js
+++ b/src/jqueryRest.js
@@ -1,51 +1,39 @@
-jqueryRest = function() {
-
-  // we do not fetch the salt from the server
-  function register(session)
-  {
-    return sendVerifier(session);
-  }
+srp.remote = (function(){
+  var jqueryRest = (function() {
 
-  function sendVerifier(session) {
-    var salt = session.getSalt();
-    return $.post("users.json", { user:
-      { login: session.getI(),
-        password_salt: salt,
-        password_verifier: session.getV(salt).toString(16)
-      }
-    });
-  }
+    // we do not fetch the salt from the server
+    function register(session) {
+      return $.post("users.json", { user: session.signup() });
+    }
 
-  function handshake(session) {
-    return $.post("sessions.json", { login: session.getI(), A: session.getAstr()});
-  }
+    function handshake(session) {
+      return $.post("sessions.json", session.handshake());
+    }
 
-  function authenticate(session) {
-    return $.ajax({
-      url: "sessions/" + session.getI() + ".json",
-      type: 'PUT',
-      data: {client_auth: session.getM()},
-    });
-  }
+    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,
+      handshake: handshake,
+      authenticate: authenticate
+    };
+  }());
 
-srp.remote = (function(){
 
   function signup(){
-    jqueryRest().register(srp.session)
+    jqueryRest.register(srp.session)
     .success(srp.signedUp)
     .error(srp.error)
   };
 
   function login(){
-    jqueryRest().handshake(srp.session)
+    jqueryRest.handshake(srp.session)
     .success(receiveSalts)
     .error(srp.error)
   };
@@ -62,7 +50,7 @@ srp.remote = (function(){
     else 
     {
       srp.session.calculations(response.salt, response.B);
-      jqueryRest().authenticate(srp.session)
+      jqueryRest.authenticate(srp.session)
       .success(confirmAuthentication)
       .error(srp.error);
     }
-- 
cgit v1.2.3