| -rw-r--r-- | backend/node/src/clipperz.js | 18 | ||||
| -rw-r--r-- | backend/node/src/clipperz.schema.sql | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js index b98c00e..b8b4d3e 100644 --- a/backend/node/src/clipperz.js +++ b/backend/node/src/clipperz.js @@ -18,16 +18,18 @@ function clipperz_store(PG) { var rv = function(o) { express_store.call(this,o); } rv.prototype.get = function(sid,cb) { PG.Q( "SELECT s_data FROM clipperz.thesession WHERE s_id=$1",[sid], - function(e,r) { cb(e,(e||!r.rowCount)?null:r.rows[0].s_data); } + function(e,r) { cb(e,(e||!r.rowCount)?null:JSON.parse(r.rows[0].s_data)); } ) }; - rv.prototype.set = function(sid,data,cb) { PG.Q( + rv.prototype.set = function(sid,data,cb) { + var d = JSON.stringify(data); + PG.Q( "UPDATE clipperz.thesession SET s_data=$1, s_mtime=current_timestamp" - +" WHERE s_id=$2",[data,sid], function(e,r) { + +" WHERE s_id=$2",[d,sid], function(e,r) { if(e) return cb(e); if(r.rowCount) return cb(); - PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,data],cb); - } - ) }; + PG.Q("INSERT INTO clipperz.thesession (s_id,s_data) VALUES ($1,$2)",[sid,d],cb); + }); + }; rv.prototype.destroy = function(sid,cb) { PG.Q( "DELETE FROM clipperz.thesession WHERE s_id=$1",[sid],cb ) }; @@ -226,7 +228,7 @@ var CLIPPERZ = module.exports = function(CONFIG) { switch(message) { case 'getUserDetails': return ASYNC.parallel({ u: function(cb) { - PG.Q("SELECT u_header::varchar,u_statistics,u_version FROM clipperz.theuser WHERE u_id=$1", + PG.Q("SELECT u_header,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")); @@ -502,7 +504,7 @@ var CLIPPERZ = module.exports = function(CONFIG) { u: function(cb) { PG.Q( "SELECT" - +" u_name, u_srp_s, u_srp_v, u_authversion, u_header::varchar, u_statistics, u_version" + +" u_name, u_srp_s, u_srp_v, u_authversion, u_header, 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")); diff --git a/backend/node/src/clipperz.schema.sql b/backend/node/src/clipperz.schema.sql index 1c2305c..591828a 100644 --- a/backend/node/src/clipperz.schema.sql +++ b/backend/node/src/clipperz.schema.sql @@ -5,7 +5,7 @@ CREATE TABLE clipperz.theuser ( u_name varchar NOT NULL UNIQUE, u_srp_s varchar NOT NULL, u_srp_v varchar NOT NULL, - u_header json NOT NULL, + u_header varchar NOT NULL, u_statistics varchar NOT NULL, u_authversion varchar NOT NULL, u_version varchar NOT NULL, @@ -61,7 +61,7 @@ CREATE TABLE clipperz.theotp ( CREATE TABLE clipperz.thesession ( s_id varchar PRIMARY KEY, - s_data json, + s_data varchar, s_ctime timestamp DEFAULT current_timestamp, s_mtime timestamp DEFAULT current_timestamp ); |