adapt-authoring-content 2.1.4 → 2.1.5

package/lib/ContentModule.js

@@ -40,7 +40,7 @@ class ContentModule extends AbstractApiModule {
     await mongodb.setIndex(this.collectionName, { _courseId: 1, _parentId: 1, _type: 1 })
     await mongodb.setIndex(this.collectionName, { _courseId: 1, _friendlyId: 1 }, {
       unique: true,
-      partialFilterExpression: { _friendlyId: { $type: 'string' } }
+      partialFilterExpression: { _friendlyId: { $type: 'string', $gt: '' } }
     })
   }
 
@@ -362,6 +362,7 @@ class ContentModule extends AbstractApiModule {
    */
   async handleClone (req, res, next) {
     try {
+      await this.requestHook.invoke(req)
       const { _id, _parentId } = req.body
       const source = await this.findOne({ _id: req.body._id })
       await this.checkAccess(req, source)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-content",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Module for managing Adapt content",
   "homepage": "https://github.com/adapt-security/adapt-authoring-content",
   "license": "GPL-3.0",

package/tests/ContentModule.spec.js

@@ -72,6 +72,7 @@ function createInstance (overrides = {}) {
     checkAccess: mock.fn(async (req, data) => data),
     log: mock.fn(),
 
+    requestHook: createMockHook(),
     preCloneHook: createMockHook(),
     postCloneHook: createMockHook(),
 
@@ -870,9 +871,10 @@ describe('ContentModule', () => {
       assert.equal(next.mock.calls[0].arguments[0], error)
     })
 
-    it('should call checkAccess before cloning', async () => {
+    it('should call requestHook, checkAccess, then clone in order', async () => {
       const callOrder = []
       const inst = createInstance()
+      inst.requestHook = { invoke: mock.fn(async () => { callOrder.push('requestHook') }) }
       inst.findOne = mock.fn(async () => {
         callOrder.push('findOne')
         return { _id: 'orig' }
@@ -895,7 +897,7 @@ describe('ContentModule', () => {
 
       await ContentModule.prototype.handleClone.call(inst, req, res, mock.fn())
 
-      assert.deepEqual(callOrder, ['findOne', 'checkAccess', 'clone'])
+      assert.deepEqual(callOrder, ['requestHook', 'findOne', 'checkAccess', 'clone'])
     })
   })