ep_comments_page 10.0.2 → 11.0.1

package/static/tests/backend/specs/api/exportHTML.js

@@ -4,12 +4,12 @@ const utils = require('../../../utils');
 const codeToBe0 = utils.codeToBe0;
 const apiVersion = utils.apiVersion;
 const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
-import settings from 'ep_etherpad-lite/node/utils/Settings'
+const settings = require('ep_etherpad-lite/node/utils/Settings');
 const common = require('ep_etherpad-lite/tests/backend/common');
+const generateJWTToken = common.generateJWTToken;
 const db = require('ep_etherpad-lite/node/db/DB');
 
 let agent;
-const apiKey = common.apiKey;
 
 describe(__filename, function () {
   let padID;
@@ -19,11 +19,13 @@ describe(__filename, function () {
 
   beforeEach(async function () {
     padID = randomString(5);
-    await agent.get(`/api/${apiVersion}/createPad?apikey=${apiKey}&padID=${padID}`)
+    await agent.get(`/api/${apiVersion}/createPad?padID=${padID}`)
+        .set('Authorization', await generateJWTToken())
         .expect(200)
         .expect('Content-Type', /json/)
         .expect(codeToBe0);
-    await agent.get(`/api/${apiVersion}/setHTML?apikey=${apiKey}&padID=${padID}&html=${html()}`)
+    await agent.get(`/api/${apiVersion}/setHTML?padID=${padID}&html=${html()}`)
+        .set('Authorization', await generateJWTToken())
         .expect(200)
         .expect('Content-Type', /json/)
         .expect(codeToBe0);
@@ -35,7 +37,8 @@ describe(__filename, function () {
     });
 
     it('returns ok', async function () {
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect(codeToBe0)
           .expect('Content-Type', /json/)
           .expect(200);
@@ -43,7 +46,8 @@ describe(__filename, function () {
 
     it('returns HTML with comment class', async function () {
       await insertCommentToDB(padID, 'c-1234');
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const expectedRegex = regexWithComment('c-1234');
             const expectedComments = new RegExp(expectedRegex);
@@ -64,7 +68,8 @@ describe(__filename, function () {
     it('returns HTML with two comments spans', async function () {
       await insertCommentToDB(padID, 'c-1234');
       await insertCommentToDB(padID, 'c-82a3');
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const firstComment = regexWithComment('c-1234');
             const secondComment = regexWithComment('c-82a3');
@@ -86,8 +91,9 @@ describe(__filename, function () {
       html = () => buildHTML('empty pad');
     });
 
-    it('returns HTML with no comment', function (done) {
-      agent.get(getHTMLEndPointFor(padID))
+    it('returns HTML with no comment', async function () {
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const expectedRegex = '.*empty pad.*';
             const noComment = new RegExp(expectedRegex);
@@ -98,8 +104,7 @@ describe(__filename, function () {
               throw new Error('Comment exported, should not have any. ' +
                               `Regex used: ${expectedRegex}, html exported: ${html}`);
             }
-          })
-          .end(done);
+          });
     });
   });
 
@@ -111,8 +116,9 @@ describe(__filename, function () {
 
     // Etherpad exports tags using the order they are defined on the array (bold is always inside
     // comment)
-    xit('returns HTML with strong and comment, in any order', function (done) {
-      agent.get(getHTMLEndPointFor(padID))
+    xit('returns HTML with strong and comment, in any order', async function () {
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect(200)
           .expect('Content-Type', /json/)
           .expect(codeToBe0)
@@ -132,8 +138,7 @@ describe(__filename, function () {
                               `[${strongInsideCommentRegex} || ${commentInsideStrongRegex}], ` +
                               `html exported: ${html}`);
             }
-          })
-          .end(done);
+          });
     });
   });
 
@@ -146,16 +151,16 @@ describe(__filename, function () {
 
     // Etherpad exports tags using the order they are defined on the array (bold is always inside
     // comment)
-    it('returns HTML with strong and comment, in any order', function (done) {
-      agent.get(getHTMLEndPointFor(padID))
+    it('returns HTML with strong and comment, in any order', async function () {
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const html = res.body.data.html;
             const foundComment = (html.indexOf('<strong>') !== -1);
             if (!foundComment) {
               throw new Error(`Comment not exported. Regex used: <strong>, html exported: ${html}`);
             }
-          })
-          .end(done);
+          });
     });
   });
 
@@ -166,7 +171,8 @@ describe(__filename, function () {
 
     it('returns HTML with part with comment and part without it', async function () {
       await insertCommentToDB(padID, 'c-2342');
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const expectedRegex = `no comment here ${regexWithComment('c-2342')}`;
             const expectedComments = new RegExp(expectedRegex);
@@ -188,7 +194,8 @@ describe(__filename, function () {
 
     it('returns ok', async function () {
       settings.ep_comments_page = {exportHTML: false};
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect(codeToBe0)
           .expect('Content-Type', /json/)
           .expect(200);
@@ -196,7 +203,8 @@ describe(__filename, function () {
 
     it('returns HTML without comment class', async function () {
       settings.ep_comments_page = {exportHtml: false};
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const expectedRegex = regexWithComment('c-1234');
             const expectedComments = new RegExp(expectedRegex);
@@ -217,7 +225,8 @@ describe(__filename, function () {
 
     it('returns ok', async function () {
       settings.ep_comments_page = {exportHTML: true};
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect(codeToBe0)
           .expect('Content-Type', /json/)
           .expect(200);
@@ -226,7 +235,8 @@ describe(__filename, function () {
     it('returns HTML with comment class', async function () {
       settings.ep_comments_page = {exportHtml: true};
       await insertCommentToDB(padID, 'c-1234');
-      agent.get(getHTMLEndPointFor(padID))
+      await agent.get(getHTMLEndPointFor(padID))
+          .set('Authorization', await generateJWTToken())
           .expect((res) => {
             const expectedRegex = regexWithComment('c-1234');
             const expectedComments = new RegExp(expectedRegex);
@@ -241,7 +251,7 @@ describe(__filename, function () {
   });
 });
 
-const getHTMLEndPointFor = (padID) => `/api/${apiVersion}/getHTML?apikey=${apiKey}&padID=${padID}`;
+const getHTMLEndPointFor = (padID) => `/api/${apiVersion}/getHTML?padID=${padID}`;
 
 const buildHTML = (body) => `<html><body>${body}</body></html>`;
 

package/static/tests/backend/specs/padCopy.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const common = require('ep_etherpad-lite/tests/backend/common');
+const generateJWTToken = common.generateJWTToken;
 const utils = require('../../utils');
 const createPad = utils.createPad;
 const createComment = utils.createComment;
@@ -9,7 +10,6 @@ const commentsEndPointFor = utils.commentsEndPointFor;
 const commentRepliesEndPointFor = utils.commentRepliesEndPointFor;
 
 let api;
-const apiKey = common.apiKey;
 
 describe(__filename, function () {
   let padID;
@@ -29,10 +29,10 @@ describe(__filename, function () {
       if (err) throw err;
       // ... duplicate pad...
       const copiedPadID = `${padID}-copy`;
-      copyPad(padID, copiedPadID, () => {
+      copyPad(padID, copiedPadID, async () => {
         // ... and finally check if comments are returned
-        const getCommentsRoute = `${commentsEndPointFor(copiedPadID)}?apikey=${apiKey}`;
-        api.get(getCommentsRoute)
+        api.get(commentsEndPointFor(copiedPadID))
+            .set('Authorization', await generateJWTToken())
             .expect((res) => {
               const commentsFound = Object.keys(res.body.data.comments);
               if (commentsFound.length !== 1) {
@@ -55,10 +55,10 @@ describe(__filename, function () {
 
         // ... duplicate pad...
         const copiedPadID = `${padID}-copy`;
-        copyPad(padID, copiedPadID, () => {
+        copyPad(padID, copiedPadID, async () => {
           // ... and finally check if replies are returned
-          const getRepliesRoute = `${commentRepliesEndPointFor(copiedPadID)}?apikey=${apiKey}`;
-          api.get(getRepliesRoute)
+          api.get(commentRepliesEndPointFor(copiedPadID))
+              .set('Authorization', await generateJWTToken())
               .expect((res) => {
                 const repliesFound = Object.keys(res.body.data.replies);
                 if (repliesFound.length !== 1) {
@@ -72,14 +72,17 @@ describe(__filename, function () {
   });
 });
 
-const copyPad = function (originalPadID, copiedPadID, callback) {
+const copyPad = async function (originalPadID, copiedPadID, callback) {
   const copyPadRoute =
-    `/api/1.2.9/copyPad?apikey=${apiKey}&sourceID=${originalPadID}&destinationID=${copiedPadID}`;
-  api.get(copyPadRoute).end((err, res) => {
-    if (err || res.body.code !== 0) {
-      throw (err || res.body.message || `unknown error while calling API route ${copyPadRoute}`);
-    }
+    `/api/1.2.9/copyPad?sourceID=${originalPadID}&destinationID=${copiedPadID}`;
+  api.get(copyPadRoute)
+      .set('Authorization', await generateJWTToken())
+      .end((err, res) => {
+        if (err || res.body.code !== 0) {
+          throw (err || res.body.message ||
+                 `unknown error while calling API route ${copyPadRoute}`);
+        }
 
-    callback();
-  });
+        callback();
+      });
 };

package/static/tests/backend/specs/padRemove.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const common = require('ep_etherpad-lite/tests/backend/common');
+const generateJWTToken = common.generateJWTToken;
 const utils = require('../../utils');
 const createPad = utils.createPad;
 const createComment = utils.createComment;
@@ -9,7 +10,6 @@ const commentsEndPointFor = utils.commentsEndPointFor;
 const commentRepliesEndPointFor = utils.commentRepliesEndPointFor;
 
 let api;
-const apiKey = common.apiKey;
 
 describe(__filename, function () {
   let padID;
@@ -28,10 +28,10 @@ describe(__filename, function () {
     createComment(padID, {}, (err, comment) => {
       if (err) throw err;
       // ... remove pad...
-      deletePad(padID, () => {
+      deletePad(padID, async () => {
         // ... and finally check if comments are returned
-        const getCommentsRoute = `${commentsEndPointFor(padID)}?apikey=${apiKey}`;
-        api.get(getCommentsRoute)
+        api.get(commentsEndPointFor(padID))
+            .set('Authorization', await generateJWTToken())
             .expect((res) => {
               const commentsFound = Object.keys(res.body.data.comments);
               if (commentsFound.length !== 0) {
@@ -54,10 +54,10 @@ describe(__filename, function () {
         if (err) throw err;
 
         // ... remove pad...
-        deletePad(padID, () => {
+        deletePad(padID, async () => {
           // ... and finally check if replies are returned
-          const getRepliesRoute = `${commentRepliesEndPointFor(padID)}?apikey=${apiKey}`;
-          api.get(getRepliesRoute)
+          api.get(commentRepliesEndPointFor(padID))
+              .set('Authorization', await generateJWTToken())
               .expect((res) => {
                 const repliesFound = Object.keys(res.body.data.replies);
                 if (repliesFound.length !== 0) {
@@ -72,13 +72,16 @@ describe(__filename, function () {
   });
 });
 
-const deletePad = function (padID, callback) {
-  const deletePadRoute = `/api/1/deletePad?apikey=${apiKey}&padID=${padID}`;
-  api.get(deletePadRoute).end((err, res) => {
-    if (err || res.body.code !== 0) {
-      throw (err || res.body.message || `unknown error while calling API route ${deletePadRoute}`);
-    }
+const deletePad = async function (padID, callback) {
+  const deletePadRoute = `/api/1/deletePad?padID=${padID}`;
+  api.get(deletePadRoute)
+      .set('Authorization', await generateJWTToken())
+      .end((err, res) => {
+        if (err || res.body.code !== 0) {
+          throw (err || res.body.message ||
+                 `unknown error while calling API route ${deletePadRoute}`);
+        }
 
-    callback();
-  });
+        callback();
+      });
 };

package/static/tests/backend/specs/readOnlyPad.js

@@ -1,11 +1,13 @@
 'use strict';
 
-const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
-const Changeset = require('ep_etherpad-lite/static/js/Changeset');
+const AttributePool = require('ep_etherpad-lite/static/js/AttributePool').default || require('ep_etherpad-lite/static/js/AttributePool');
+const Changeset = require('ep_etherpad-lite/static/js/Changeset').default || require('ep_etherpad-lite/static/js/Changeset');
+const SmartOpAssemblerModule = require('ep_etherpad-lite/static/js/SmartOpAssembler');
+const SmartOpAssembler = SmartOpAssemblerModule.SmartOpAssembler || SmartOpAssemblerModule.default || SmartOpAssemblerModule;
 const assert = require('assert').strict;
 const common = require('ep_etherpad-lite/tests/backend/common');
 const padManager = require('ep_etherpad-lite/node/db/PadManager');
-const readOnlyManager = require('ep_etherpad-lite/node/db/ReadOnlyManager');
+const readOnlyManager = require('ep_etherpad-lite/node/db/ReadOnlyManager').default || require('ep_etherpad-lite/node/db/ReadOnlyManager');
 const shared = require('../../../js/shared.js');
 
 describe(__filename, function () {
@@ -22,7 +24,7 @@ describe(__filename, function () {
     const op = Changeset.newOp(opcode);
     op.chars = 1;
     op.attribs = Changeset.makeAttribsString(opcode, attribs, apool);
-    const assem = Changeset.smartOpAssembler();
+    const assem = new SmartOpAssembler();
     assem.append(op);
     const cs = assem.toString();
     const newLen = oldLen + assem.getLengthChange();

package/static/tests/utils.js

@@ -3,7 +3,7 @@
 const common = require('ep_etherpad-lite/tests/backend/common');
 const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 
-const apiKey = common.apiKey;
+const generateJWTToken = common.generateJWTToken;
 const apiVersion = 1;
 
 // Functions to validate API responses:
@@ -29,9 +29,10 @@ const commentRepliesEndPointFor = function (pad) {
 
 // Creates a pad and returns the pad id. Calls the callback when finished.
 const createPad = function (done) {
-  common.init().then((agent) => {
+  common.init().then(async (agent) => {
     const pad = randomString(5);
-    agent.get(`/api/${apiVersion}/createPad?apikey=${apiKey}&padID=${pad}`)
+    agent.get(`/api/${apiVersion}/createPad?padID=${pad}`)
+        .set('Authorization', await generateJWTToken())
         .end((err, res) => {
           if (err || (res.body.code !== 0)) return done(new Error('Unable to create new Pad'));
           done(null, pad);
@@ -40,8 +41,9 @@ const createPad = function (done) {
 };
 
 const readOnlyId = function (padID, done) {
-  common.init().then((agent) => {
-    agent.get(`/api/${apiVersion}/getReadOnlyID?apikey=${apiKey}&padID=${padID}`)
+  common.init().then(async (agent) => {
+    agent.get(`/api/${apiVersion}/getReadOnlyID?padID=${padID}`)
+        .set('Authorization', await generateJWTToken())
         .end((err, res) => {
           if (err || (res.body.code !== 0)) return done(new Error('Unable to get read only id'));
           done(null, res.body.data.readOnlyID);
@@ -54,10 +56,10 @@ const createComment = function (pad, commentData, done) {
   commentData = commentData || {};
   commentData.name = commentData.name || 'John Doe';
   commentData.text = commentData.text || 'This is a comment';
-  common.init().then((agent) => {
+  common.init().then(async (agent) => {
     agent.post(commentsEndPointFor(pad))
+        .set('Authorization', await generateJWTToken())
         .send({
-          apikey: apiKey,
           data: JSON.stringify([commentData]),
         })
         .expect(200)
@@ -76,10 +78,10 @@ const createCommentReply = function (pad, comment, replyData, done) {
   replyData.commentId = comment;
   replyData.name = replyData.name || 'John Doe';
   replyData.text = replyData.text || 'This is a reply';
-  common.init().then((agent) => {
+  common.init().then(async (agent) => {
     agent.post(commentRepliesEndPointFor(pad))
+        .set('Authorization', await generateJWTToken())
         .send({
-          apikey: apiKey,
           data: JSON.stringify([replyData]),
         })
         .expect(200)