Fix: don't send pg output directly to the client

Signed-off-by: Vladyslav Karpenko <[email protected]>

Author: KLarpen

JavaScript/b-transport/api/country.js

@@ -3,11 +3,13 @@ const country = db('country');
 ({
   async read(id) {
     console.log({ db });
-    return country.read(id);
+    const output = await country.read(id);
+    return output.rows;
   },
 
   async find(mask) {
     const sql = 'SELECT * from country where name like $1';
-    return country.query(sql, [mask]);
+    const output = await country.query(sql, [mask]);
+    return output.rows;
   },
 });

JavaScript/b-transport/api/user.js

@@ -1,24 +1,29 @@
 ({
   async read(id) {
-    return db('users').read(id, ['id', 'login']);
+    const output = await db('users').read(id, ['id', 'login']);
+    return output.rows;
   },
 
   async create({ login, password }) {
     const passwordHash = await common.hash(password);
-    return db('users').create({ login, password: passwordHash });
+    const output = await db('users').create({ login, password: passwordHash });
+    return output.rows;
   },
 
   async update(id, { login, password }) {
     const passwordHash = await common.hash(password);
-    return db('users').update(id, { login, password: passwordHash });
+    const output = await db('users').update(id, { login, password: passwordHash });
+    return output.rows;
   },
 
   async delete(id) {
-    return db('users').delete(id);
+    const output = await db('users').delete(id);
+    return output.rows;
   },
 
   async find(mask) {
     const sql = 'SELECT login from users where login like $1';
-    return db('users').query(sql, [mask]);
+    const output = await db('users').query(sql, [mask]);
+    return output.rows;
   },
 });

JavaScript/b-transport/transport/http.js

@@ -32,7 +32,7 @@ module.exports = (routing, port, console) => {
     if (!handler) return res.end('"Not found"');
     const { args } = await receiveArgs(req);
     console.log(`${socket.remoteAddress} ${method} ${url}`);
-    const result = await handler(args);
+    const result = await handler(...args);
     res.end(JSON.stringify(result));
   }).listen(port);
 

JavaScript/c-commonjs/api/country.js

@@ -6,11 +6,13 @@ const country = db.crud('country');
 module.exports = {
   async read(id) {
     console.log({ db });
-    return country.read(id);
+    const output = await country.read(id);
+    return output.rows;
   },
 
   async find(mask) {
     const sql = 'SELECT * from country where name like $1';
-    return country.query(sql, [mask]);
+    const output = await country.query(sql, [mask]);
+    return output.rows;
   },
 };

JavaScript/c-commonjs/api/user.js

@@ -6,25 +6,30 @@ const users = db.crud('users');
 
 module.exports = {
   async read(id) {
-    return users.read(id, ['id', 'login']);
+    const output = await users.read(id, ['id', 'login']);
+    return output.rows;
   },
 
   async create({ login, password }) {
     const passwordHash = await common.hash(password);
-    return users.create({ login, password: passwordHash });
+    const output = await users.create({ login, password: passwordHash });
+    return output.rows;
   },
 
   async update(id, { login, password }) {
     const passwordHash = await common.hash(password);
-    return users.update(id, { login, password: passwordHash });
+    const output = await users.update(id, { login, password: passwordHash });
+    return output.rows;
   },
 
   async delete(id) {
-    return users.delete(id);
+    const output = await users.delete(id);
+    return output.rows;
   },
 
   async find(mask) {
     const sql = 'SELECT login from users where login like $1';
-    return users.query(sql, [mask]);
+    const output = await users.query(sql, [mask]);
+    return output.rows;
   },
 };

JavaScript/c-commonjs/transport/http.js

@@ -32,7 +32,7 @@ module.exports = (routing, port, console) => {
     if (!handler) return res.end('"Not found"');
     const { args } = await receiveArgs(req);
     console.log(`${socket.remoteAddress} ${method} ${url}`);
-    const result = await handler(args);
+    const result = await handler(...args);
     res.end(JSON.stringify(result));
   }).listen(port);