author | Michael Krelin <hacker@klever.net> | 2013-11-25 19:04:15 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2013-11-25 19:04:15 (UTC) |
commit | 8718e9094c37bde8205fd1fe3c42b4bf590486ab (patch) (side-by-side diff) | |
tree | 7e32d19a483964dc153d767cc9bbefab521deeea /backend/node/src/clipperz.js | |
parent | 706ed5b980c48ad807923d36741f19b21f2911a6 (diff) | |
download | clipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.zip clipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.tar.gz clipperz-8718e9094c37bde8205fd1fe3c42b4bf590486ab.tar.bz2 |
retrieve header as a string to avoid restringification
Diffstat (limited to 'backend/node/src/clipperz.js') (more/less context) (ignore whitespace changes)
-rw-r--r-- | backend/node/src/clipperz.js | 8 |
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 @@ -190,33 +190,33 @@ var CLIPPERZ = module.exports = function(CONFIG) { break; case 'message': if(!req.session.K) return res.res({result:'EXCEPTION',message:"effectively, we're missing a aconnection"}); if(req.session.K!=pp.srpSharedSecret) return res.res({error:'Wrong shared secret!'}); switch(message) { case 'getUserDetails': return ASYNC.parallel({ u: function(cb) { - PG.Q("SELECT u_header,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", + PG.Q("SELECT u_header::varchar,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", [req.session.u],function(e,r) { if(e) return cb(e); if(!r.rowCount) return cb(new Error("user's gone AWOL")); cb(null,r.rows[0]); }); }, stats: function(cb) { PG.Q("SELECT r_ref,r_mtime FROM clipperz.therecord WHERE u_id=$1", [req.session.u],function(e,r) { if(e) return cb(e); cb(null,r.rows.reduce(function(p,r){p[r.r_ref]={updateDate:r.r_mtime};return p},{})); }); } },function(e,r) { if(e) return cb(e); - res.res({header:JSON.stringify(r.u.u_header),statistics:r.u.u_statistics,version:r.u.u_version,recordsStats:r.stats}); + res.res({header:r.u.u_header,statistics:r.u.u_statistics,version:r.u.u_version,recordsStats:r.stats}); }); case 'saveChanges': return PG.T(function(e,T) { if(e) return cb(e); ASYNC.auto({ user: function(cb) { T.Q( "UPDATE clipperz.theuser" @@ -466,23 +466,23 @@ var CLIPPERZ = module.exports = function(CONFIG) { }, dump: function(req,res,cb) { if(!req.session.u) return cb(new Error('logging in helps')); return ASYNC.parallel({ u: function(cb) { PG.Q( "SELECT" - +" u_name, u_srp_s, u_srp_v, u_authversion, u_header, u_statistics, u_version" + +" u_name, u_srp_s, u_srp_v, u_authversion, u_header::varchar, u_statistics, u_version" +" FROM clipperz.theuser WHERE u_id=$1",[req.session.u],function(e,r) { if(e) return cb(e); if(!r.rowCount) return cb(new Error("user's gone AWOL")); r = r.rows[0]; return cb(null,{u:r.u_name,d:{s:r.u_srp_s,v:r.u_srp_v, version:r.u_authversion, - maxNumberOfRecords: '100', userDetails: JSON.stringify(r.u_header), + maxNumberOfRecords: '100', userDetails: r.u_header, statistics: r.u_statistics, userDetailsVersion: r.u_version }}); }); }, records: function(cb) { PG.Q( "SELECT" +" r.r_id, r.r_ref, r_data, r_version, r_ctime, r_mtime, r_atime," |