Merge pull request #755 from nidico/issue-754-config-require-freeurl-authentication

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/web/note/util.js b/lib/web/note/util.js
index 9c6c1c8a..57438515 100644
--- a/lib/web/note/util.js
+++ b/lib/web/note/util.js
@@ -51,10 +51,12 @@ exports.newNote = function (req, res, body) {
   } else if (!config.allowAnonymous) {
     return errors.errorForbidden(res)
   }
-  if (config.allowFreeURL && noteId && !config.forbiddenNoteIDs.includes(noteId)) {
-    req.alias = noteId
-  } else if (noteId) {
-    return req.method === 'POST' ? errors.errorForbidden(res) : errors.errorNotFound(res)
+  if (noteId) {
+    if (config.allowFreeURL && !config.forbiddenNoteIDs.includes(noteId) && (!config.requireFreeURLAuthentication || req.isAuthenticated())) {
+      req.alias = noteId
+    } else {
+      return req.method === 'POST' ? errors.errorForbidden(res) : errors.errorNotFound(res)
+    }
   }
   models.Note.create({
     ownerId: owner,