From 5192a0c498bd99a14bdf9729089b789ef64bfc86 Mon Sep 17 00:00:00 2001
From: Ray Bellis <ray@isc.org>
Date: Wed, 30 Jan 2019 16:19:51 +0000
Subject: [PATCH] db/ReadOnlyManager.js: completed conversion

Requires temporary hack within `Pad.remove()` to allow for the lack of
callback on the rewritten version.
---
 src/node/db/Pad.js             |  8 +++-
 src/node/db/ReadOnlyManager.js | 79 ++++++++++------------------------
 2 files changed, 30 insertions(+), 57 deletions(-)

diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index 4abf2cab2..db35bd367 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -19,6 +19,7 @@ var crypto = require("crypto");
 var randomString = require("../utils/randomstring");
 var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 const thenify = require("thenify").withCallback;
+const nodeify = require("nodeify");
 
 // serialization/deserialization attributes
 var attributeBlackList = ["id"];
@@ -621,7 +622,12 @@ Pad.prototype.remove = thenify(function remove(callback) {
 
         // remove the readonly entries
         function(callback) {
-          readOnlyManager.getReadOnlyId(padID, function(err, readonlyID) {
+          // @TODO - temporary until surrounding code is Promisified
+          function getReadOnlyId(padID, callback) {
+            return nodeify(readOnlyManager.getReadOnlyId(padID), callback);
+          }
+
+          getReadOnlyId(padID, function(err, readonlyID) {
             if (ERR(err, callback)) return;
 
             db.remove("pad2readonly:" + padID);
diff --git a/src/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js
index 14c6f75c7..96a52d479 100644
--- a/src/node/db/ReadOnlyManager.js
+++ b/src/node/db/ReadOnlyManager.js
@@ -19,80 +19,47 @@
  */
 
 
-var ERR = require("async-stacktrace");
-var db = require("./DB").db;
-var async = require("async");
+var db = require("./DB");
 var randomString = require("../utils/randomstring");
-const thenify = require("thenify").withCallback;
 
 /**
  * returns a read only id for a pad
  * @param {String} padId the id of the pad
  */
-exports.getReadOnlyId = thenify(function (padId, callback)
+exports.getReadOnlyId = async function (padId)
 {
-  var readOnlyId;
+  // check if there is a pad2readonly entry
+  let readOnlyId = await db.get("pad2readonly:" + padId);
 
-  async.waterfall([
-    // check if there is a pad2readonly entry
-    function(callback) {
-      db.get("pad2readonly:" + padId, callback);
-    },
+  // there is no readOnly Entry in the database, let's create one
+  if (readOnlyId == null) {
+    readOnlyId = "r." + randomString(16);
+    db.set("pad2readonly:" + padId, readOnlyId);
+    db.set("readonly2pad:" + readOnlyId, padId);
+  }
 
-    function(dbReadOnlyId, callback) {
-      if (dbReadOnlyId == null) {
-        // there is no readOnly Entry in the database, let's create one
-        readOnlyId = "r." + randomString(16);
-
-        db.set("pad2readonly:" + padId, readOnlyId);
-        db.set("readonly2pad:" + readOnlyId, padId);
-      } else {
-        // there is a readOnly Entry in the database, let's take this one
-        readOnlyId = dbReadOnlyId;
-      }
-
-      callback();
-    }
-  ],
-  function(err) {
-    if (ERR(err, callback)) return;
-
-    // return the results
-    callback(null, readOnlyId);
-  })
-});
+  return readOnlyId;
+}
 
 /**
  * returns the padId for a read only id
  * @param {String} readOnlyId read only id
  */
-exports.getPadId = thenify(function(readOnlyId, callback)
+exports.getPadId = function(readOnlyId)
 {
-  db.get("readonly2pad:" + readOnlyId, callback);
-});
+  return db.get("readonly2pad:" + readOnlyId);
+}
 
 /**
  * returns the padId and readonlyPadId in an object for any id
  * @param {String} padIdOrReadonlyPadId read only id or real pad id
  */
-exports.getIds = thenify(function(id, callback) {
-  if (id.indexOf("r.") == 0) {
-    exports.getPadId(id, function (err, value) {
-      if (ERR(err, callback)) return;
+exports.getIds = async function(id) {
+  let readonly = (id.indexOf("r.") === 0);
 
-      callback(null, {
-        readOnlyPadId: id,
-        padId: value, // Might be null, if this is an unknown read-only id
-        readonly: true
-      });
-    });
-  } else {
-    exports.getReadOnlyId(id, function (err, value) {
-      callback(null, {
-        readOnlyPadId: value,
-        padId: id,
-        readonly: false
-      });
-    });
-  }
-});
+  // Might be null, if this is an unknown read-only id
+  let readOnlyPadId = readonly ? id : await exports.getReadOnlyId(id);
+  let padId = readonly ? await exports.getPadId(id) : id;
+
+  return { readOnlyPadId, padId, readonly };
+}