(Fix) Handle locked sessions

web-dapp/controllers/notifyRegTx.js

@@ -150,6 +150,11 @@ const removeUsedSessionKey = (opts, prelog) => {
         });
 };
 
+const unlockSession = (sessionKey, prelog) => {
+    logger.log(`${prelog} unlocking session: ${sessionKey}`);
+    return db.unlock(sessionKey);
+};
+
 module.exports = {
     validateData,
     normalizeData,
@@ -158,4 +163,5 @@ module.exports = {
     getAddressByBN,
     createPostCard,
     removeUsedSessionKey,
+    unlockSession,
 };

web-dapp/routes/notify_reg_tx.js

@@ -43,7 +43,15 @@ module.exports = () => {
             })
             .catch(error => {
                 logger.error(`${prelog} ${error.msg}`);
-                return sendResponse(res, { ok: false, err: error.msg });
+                return notifyRegTxController
+                    .unlockSession(sessionKey, prelog)
+                    .then(
+                        () => {},
+                        () => logger.error(`${prelog} Could not unlock key ${sessionKey}`)
+                    )
+                    .then(() => {
+                        return sendResponse(res, { ok: false, err: error.msg });
+                    });
             });
     });
 

web-dapp/server-lib/session-stores/memory.js

@@ -25,6 +25,11 @@ module.exports = function () {
                 return resolve(db[k1(k)]);
             });
         },
+        unlock: (k) => {
+            db[k] = db[k1(k)];
+            delete db[k1(k)];
+            return Promise.resolve();
+        },
         unset: (k) => {
             delete db[k1(k)];
             return new Promise((resolve) => {

web-dapp/server-lib/session-stores/redis.js

@@ -4,9 +4,20 @@ const logger = require('../logger');
 const redis = require('redis'); // https://github.com/NodeRedis/node_redis
 
 const prelog = '[redis]';
+const lockedPrefix = 'locked';
 
 function k1(k) {
-    return `locked:${k}`;
+    return `${lockedPrefix}:${k}`;
+}
+
+function unlock(client, k) {
+    return new Promise((resolve, reject) => {
+        client.rename(k1(k), k, (err, res) => {
+            if (err) return reject(err);
+
+            resolve(res);
+        });
+    });
 }
 
 module.exports = function () {
@@ -30,6 +41,20 @@ module.exports = function () {
         logger.error(`${prelog} connection closed`);
     });
 
+    client.keys(`${lockedPrefix}:*`, (err, keys) => {
+        if (err) {
+            logger.error('Could not get keys to unlock');
+            return;
+        }
+
+        keys.forEach((key) => {
+            unlock(client, key.replace(`${lockedPrefix}:`, ''))
+                .catch((e) => {
+                    logger.error(`Could not unlock key ${key}`, e);
+                });
+        });
+    });
+
     return {
         set: function (k, v) {
             return new Promise((resolve) => {
@@ -55,6 +80,9 @@ module.exports = function () {
                 });
             });
         },
+        unlock: (k) => {
+            return unlock(client, k);
+        },
         get: (k) => {
             return new Promise((resolve, reject) => {
                 client.get(k, (err, v) => {

web-dapp/test/server/notify_reg_tx.spec.js

@@ -33,6 +33,7 @@ jest.mock('../../controllers/notifyRegTx', () => ({
     getAddressByBN: jest.fn(() => Promise.resolve('0x1aa2d288d03d8397c193d2327ee7a7443d4ec3a3')),
     createPostCard: jest.fn(() => Promise.resolve({ postcard: 'PostCard' })),
     removeUsedSessionKey: jest.fn(() => Promise.resolve({ ok: true, result: { postcard: 'PostCard' } })),
+    unlockSession: jest.fn(() => Promise.resolve()),
 }));
 
 describe('notify_reg_tx', () => {