summaryrefslogtreecommitdiff
path: root/backend
authorMichael Krelin <hacker@klever.net>2013-11-25 19:04:15 (UTC)
committer Michael Krelin <hacker@klever.net>2013-11-25 19:04:15 (UTC)
commit8718e9094c37bde8205fd1fe3c42b4bf590486ab (patch) (unidiff)
tree7e32d19a483964dc153d767cc9bbefab521deeea /backend
parent706ed5b980c48ad807923d36741f19b21f2911a6 (diff)
downloadclipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.zip
clipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.tar.gz
clipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.tar.bz2
retrieve header as a string to avoid restringification
Diffstat (limited to 'backend') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index c6d776a..eebd5bf 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -194,9 +194,9 @@ var CLIPPERZ = module.exports = function(CONFIG) {
194 if(req.session.K!=pp.srpSharedSecret) return res.res({error:'Wrong shared secret!'}); 194 if(req.session.K!=pp.srpSharedSecret) return res.res({error:'Wrong shared secret!'});
195 switch(message) { 195 switch(message) {
196 case 'getUserDetails': return ASYNC.parallel({ 196 case 'getUserDetails': return ASYNC.parallel({
197 u: function(cb) { 197 u: function(cb) {
198 PG.Q("SELECT u_header,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", 198 PG.Q("SELECT u_header::varchar,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1",
199 [req.session.u],function(e,r) { 199 [req.session.u],function(e,r) {
200 if(e) return cb(e); 200 if(e) return cb(e);
201 if(!r.rowCount) return cb(new Error("user's gone AWOL")); 201 if(!r.rowCount) return cb(new Error("user's gone AWOL"));
202 cb(null,r.rows[0]); 202 cb(null,r.rows[0]);
@@ -210,9 +210,9 @@ var CLIPPERZ = module.exports = function(CONFIG) {
210 }); 210 });
211 } 211 }
212 },function(e,r) { 212 },function(e,r) {
213 if(e) return cb(e); 213 if(e) return cb(e);
214 res.res({header:JSON.stringify(r.u.u_header),statistics:r.u.u_statistics,version:r.u.u_version,recordsStats:r.stats}); 214 res.res({header:r.u.u_header,statistics:r.u.u_statistics,version:r.u.u_version,recordsStats:r.stats});
215 }); 215 });
216 216
217 case 'saveChanges': return PG.T(function(e,T) { 217 case 'saveChanges': return PG.T(function(e,T) {
218 if(e) return cb(e); 218 if(e) return cb(e);
@@ -470,15 +470,15 @@ var CLIPPERZ = module.exports = function(CONFIG) {
470 return ASYNC.parallel({ 470 return ASYNC.parallel({
471 u: function(cb) { 471 u: function(cb) {
472 PG.Q( 472 PG.Q(
473 "SELECT" 473 "SELECT"
474 +" u_name, u_srp_s, u_srp_v, u_authversion, u_header, u_statistics, u_version" 474 +" u_name, u_srp_s, u_srp_v, u_authversion, u_header::varchar, u_statistics, u_version"
475 +" FROM clipperz.theuser WHERE u_id=$1",[req.session.u],function(e,r) { 475 +" FROM clipperz.theuser WHERE u_id=$1",[req.session.u],function(e,r) {
476 if(e) return cb(e); 476 if(e) return cb(e);
477 if(!r.rowCount) return cb(new Error("user's gone AWOL")); 477 if(!r.rowCount) return cb(new Error("user's gone AWOL"));
478 r = r.rows[0]; 478 r = r.rows[0];
479 return cb(null,{u:r.u_name,d:{s:r.u_srp_s,v:r.u_srp_v, version:r.u_authversion, 479 return cb(null,{u:r.u_name,d:{s:r.u_srp_s,v:r.u_srp_v, version:r.u_authversion,
480 maxNumberOfRecords: '100', userDetails: JSON.stringify(r.u_header), 480 maxNumberOfRecords: '100', userDetails: r.u_header,
481 statistics: r.u_statistics, userDetailsVersion: r.u_version 481 statistics: r.u_statistics, userDetailsVersion: r.u_version
482 }}); 482 }});
483 }); 483 });
484 }, 484 },