data submission actually working with correct masks

Author: lucyq

client/app/controllers/analyticsController.js

@@ -25,6 +25,8 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
       discrepancies: SEMANTIC_CELLS
     };
 
+    var MOUSE_PRECISION = 64;
+
 
     let analytics = {
       validation_errors: {},
@@ -40,9 +42,9 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
     */
 
     // define mouse_positions as 100x1000 array
-    for (var i = 0; i < 100; i++) {
+    for (var i = 0; i < MOUSE_PRECISION; i++) {
       analytics.mouse_positions.push([]);
-      for (var k = 0; k < 1000; k++) {
+      for (var k = 0; k < MOUSE_PRECISION; k++) {
         analytics.mouse_positions[i].push(0)
       }
     }
@@ -78,8 +80,8 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
       // to account for difference in x, y page size
 
       var pos = getPos(event);
-      var x = Math.floor(pos[0] * 100);
-      var y = Math.floor(pos[1] * 1000);
+      var x = Math.floor(pos[0] * MOUSE_PRECISION);
+      var y = Math.floor(pos[1] * MOUSE_PRECISION);
       //each array stores # of hits at this area
       analytics.mouse_positions[x][y]++;
     }
@@ -432,14 +434,11 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
 
       beforeunload(); // updates time analytic
       analytics.time_ms = Math.floor(analytics.time_ms / 1000);
-      console.log("analytics", analytics);
 
       var analytic_shares = mpc.secretShareValues(analytics);
       var analytic_data = analytic_shares['data'];
       var analytic_mask = analytic_shares['mask'];
 
-      console.log('analytic data', analytic_data);
-      console.log('analytic masks', analytic_mask);
       // Correlation using modified small pairwise 'hypercubes'. (one cube for each pair of questions)
       // For every pair of questions, compute and encrypt the two chosen answers.
       var pairwise_hypercubes = {};

client/app/controllers/clientController.js

@@ -17,7 +17,7 @@ define(['helper/mpc', 'controllers/tableController', 'filesaver'], function (mpc
     console.log('analytics mask',aMOut);
 
     mOut = JSON.parse(mOut.data);
-    console.log(mOut);
+    // console.log(mOut);
     // Questions Public is the public answers to questions.
     var questions_public = [];
     for (var i = 0; i < mOut.length; i++) {

client/app/controllers/unmaskController.js

@@ -86,8 +86,7 @@ define(['forge'], function (forge) {
     for (var key in obj) {
       if (obj.hasOwnProperty(key)) {
         var value = obj[key];
-        if (typeof(value) === 'number') {
-          console.log("secretsharevalue:",value);
+        if (typeof(value) === 'number' &&  !(isNaN(value))) {
           var shares = _secretShare(value, 2);
 
           dataTuples[key] = shares[0];

client/app/helper/mpc.js

@@ -133,7 +133,7 @@ <h2 class="text-center">Unmask Aggregate Data</h2>
           <form>
             <div class="form-group">
               <label class="control-label" for="session">Session Key</label>
-              <input type="text" id="session" value="3wcd7hgekettex9qmk55h6t798" class="form-control" placeholder="Session Key" pattern="^[a-zA-Z0-9]{26}$" autocomplete="off" required/>
+              <input type="text" id="session" value="a1nyre0b5t924c7ng94pye75k4" class="form-control" placeholder="Session Key" pattern="^[a-zA-Z0-9]{26}$" autocomplete="off" required/>
               <span id="session-success" class="success-icon glyphicon glyphicon-ok form-control-feedback hidden"
               aria-hidden="true"></span>
               <span id="session-fail" class="fail-icon glyphicon glyphicon-remove form-control-feedback hidden"
@@ -145,7 +145,7 @@ <h2 class="text-center">Unmask Aggregate Data</h2>
             </div>
             <div class="form-group">
               <label class="control-label" for="session-password">Session Password</label>
-              <input type="text" value="2ywayksw257g56xrdrza1yszrw" id="session-password" class="form-control" placeholder="Session Password"
+              <input type="text" value="tpb27h476v2tf49sm1z8y0fz58" id="session-password" class="form-control" placeholder="Session Password"
               pattern="^[a-zA-Z0-9]{26}$"
               autocomplete="off" required>
               <span id="session-password-success" class="success-icon glyphicon glyphicon-ok form-control-feedback hidden" aria-hidden="true"></span>

client/unmask.html

@@ -303,7 +303,9 @@ app.post('/', function (req, res) {
         user = body.user,
         ID = session + user, // will use concat of user + session for now
         analytics = body.analytic_data,
-        analyticsMask = body.analytics_mask;
+        analyticsMask = body.analytic_mask;
+
+        console.log('BODY!!!', analyticsMask);
 
       // Ensure user key exists.
       UserKey.findOne({_id: ID}, function (err, data) {