Merge pull request #11 from stefan-mihaila/master

Minor fixes

api/controllers/payment.ts

@@ -6,8 +6,9 @@ import * as helpers from '../helpers'
 import { success } from '../utils/res'
 import * as lightning from '../utils/lightning'
 import {tokenFromTerms} from '../utils/ldat'
+import * as constants from '../../config/constants.json'
+
 
-const constants = require(__dirname + '/../../config/constants.json');
 
 const sendPayment = async (req, res) => {
   const {
@@ -107,6 +108,7 @@ const sendPayment = async (req, res) => {
       success(res, jsonUtils.messageToJson(message, chat))
     },
     failure: (error) => {
+      message.update({status: constants.statuses.failed})
       res.status(200);
       res.json({ success: false, error });
       res.end();

api/hub.ts

@@ -135,13 +135,12 @@ const finishInviteInHub = (params, onSuccess, onFailure) => {
   })
   .then(res => res.json())
   .then(json => {
-    if (json.object) {
+    console.log('[hub] finished invite to hub')
-      console.log('[hub] finished invite to hub')
+    onSuccess(json)
-      onSuccess(json)
+  })
-    } else {
+  .catch(e => {
-      console.log('[hub] fail to finish invite in hub')
+    console.log('[hub] fail to finish invite in hub')
-      onFailure(json)
+    onFailure(e)
-    }
   })
 }
 

dist/api/controllers/payment.js

@@ -17,7 +17,7 @@ const helpers = require("../helpers");
 const res_1 = require("../utils/res");
 const lightning = require("../utils/lightning");
 const ldat_1 = require("../utils/ldat");
-const constants = require(__dirname + '/../../config/constants.json');
+const constants = require("../../config/constants.json");
 const sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const { amount, chat_id, contact_id, destination_key, media_type, muid, text, remote_text, dimensions, remote_text_map, contact_ids, } = req.body;
     console.log('[send payment]', req.body);
@@ -98,6 +98,7 @@ const sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
             res_1.success(res, jsonUtils.messageToJson(message, chat));
         }),
         failure: (error) => {
+            message.update({ status: constants.statuses.failed });
             res.status(200);
             res.json({ success: false, error });
             res.end();

dist/api/hub.js

@@ -130,14 +130,12 @@ const finishInviteInHub = (params, onSuccess, onFailure) => {
     })
         .then(res => res.json())
         .then(json => {
-        if (json.object) {
+        console.log('[hub] finished invite to hub');
-            console.log('[hub] finished invite to hub');
+        onSuccess(json);
-            onSuccess(json);
+    })
-        }
+        .catch(e => {
-        else {
+        console.log('[hub] fail to finish invite in hub');
-            console.log('[hub] fail to finish invite in hub');
+        onFailure(e);
-            onFailure(json);
-        }
     });
 };
 exports.finishInviteInHub = finishInviteInHub;