apostrophe 3.34.0 → 3.35.0

package/test/concurrent-array-relationships.js

@@ -89,7 +89,6 @@ describe('Concurrent Array Joins', function() {
       for (let i = 0; (i < 10); i++) {
         const person = result[i];
         assert.strictEqual(person.title, `Hobbyist ${i}`);
-        console.log(person);
         assert.strictEqual(person.hobbies.length, 1);
         assert.strictEqual(person.hobbies[0].name, `Hobby ${i}`);
         assert(person.hobbies[0]._friends);

package/test/users.js

@@ -98,6 +98,27 @@ describe('Users', function() {
     }
   });
 
+  it('should verify a user password created with former credential package', async function() {
+    const req = apos.task.getReq();
+    const user = apos.user.newInstance();
+
+    user.title = 'Old User';
+    user.username = 'olduser';
+    user.password = 'passwordThatWentThroughOldCredentialPackageHashing';
+    user.email = 'old@user.com';
+    user.role = 'admin';
+
+    await apos.user.insert(req, user);
+
+    // A password hash that were generated by the former credential package:
+    const oldPasswordHashSimulated =
+      '{"hash":"/1GntJjtkMY1iPmQY1gn9f3bOZ5tb2qFL+x4qsDerZq2JL8+12TERR4/xqh246wBb+QJwwIRsF/6E+eccshsLxT/","salt":"GJHukLNaG6xDgdIpxVOpqV7xQLQM7e5xnhDW7oaUOe7mTicr7Ca76M4uUJalN/cQ68CE9O7yXZ5WJOz4RN/udcX0","keyLength":66,"hashMethod":"pbkdf2","iterations":2853053}';
+
+    await apos.user.safe.update({ username: 'olduser' }, { $set: { passwordHash: oldPasswordHashSimulated } });
+    await apos.user.verifyPassword(user, 'passwordThatWentThroughOldCredentialPackageHashing');
+    await apos.user.safe.remove({ username: 'olduser' });
+  });
+
   it('should not be able to insert a new user if their email already exists', async function() {
     assert(apos.user.newInstance);
     const user = apos.user.newInstance();

package/test/utils/commands.js

@@ -0,0 +1,204 @@
+const moduleA = {
+  commands: {
+    add: {
+      '@apostrophecms/command-menu:toggle-shortcuts': {
+        type: 'item',
+        label: 'commandMenuShortcutToggleShortcuts',
+        action: {
+          type: 'toggle-shortcuts',
+          payload: {}
+        },
+        shortcut: 'Shift+K ?'
+      }
+    },
+    modal: {
+      default: {
+        '@apostrophecms/command-menu:content': {
+          label: 'commandMenuContent',
+          commands: [
+            '@apostrophecms/command-menu:undo',
+            '@apostrophecms/command-menu:redo',
+            '@apostrophecms/command-menu:toggle-shortcuts'
+          ]
+        }
+      }
+    }
+  }
+};
+const moduleB = {
+  commands: {
+    add: {
+      '@apostrophecms/command-menu:test': {
+        type: 'item',
+        label: 'commandMenuShortcutTest',
+        action: {
+          type: 'test',
+          payload: {}
+        },
+        shortcut: 'Shift+G'
+      }
+    },
+    modal: {
+      default: {
+        '@apostrophecms/command-menu:content': {
+          label: 'commandMenuContent',
+          commands: [
+            '@apostrophecms/command-menu:discard-draft',
+            '@apostrophecms/command-menu:publish-draft',
+            '@apostrophecms/command-menu:test'
+          ]
+        }
+      }
+    }
+  }
+};
+const moduleC = {
+  commands: {
+    remove: [
+      '@apostrophecms/command-menu:test'
+    ],
+    modal: {
+      default: {
+        '@apostrophecms/command-menu:modes': {
+          label: 'commandMenuModes',
+          commands: [
+            '@apostrophecms/command-menu:toggle-edit-preview-mode',
+            '@apostrophecms/command-menu:toggle-publish-draft-mode'
+          ]
+        }
+      }
+    }
+  }
+};
+const moduleD = {
+  commands: {
+    add: {
+      '@apostrophecms/command-menu:toggle-shortcuts': {
+        shortcut: '?'
+      }
+    },
+    group: {
+      '@apostrophecms/command-menu:general': {
+        label: 'commandMenuGeneral',
+        commands: [
+          '@apostrophecms/command-menu:toggle-shortcuts',
+          'command-menu'
+        ]
+      }
+    }
+  }
+};
+const article = {
+  commands: {
+    add: {
+      'article:create-new': {
+        type: 'item',
+        label: 'apostrophe:commandMenuCreateNew',
+        action: {},
+        shortcut: '',
+        modal: 'article:manager'
+      },
+      'article:search': {
+        type: 'item',
+        label: 'apostrophe:commandMenuSearch',
+        action: {},
+        shortcut: '',
+        modal: 'article:manager'
+      },
+      'article:select-all': {
+        type: 'item',
+        label: 'apostrophe:commandMenuSelectAll',
+        action: {},
+        shortcut: '',
+        modal: 'article:manager'
+      },
+      'article:archive-selected': {
+        type: 'item',
+        label: 'apostrophe:commandMenuArchiveSelected',
+        action: {},
+        shortcut: '',
+        modal: 'article:manager'
+      },
+      'article:exit-manager': {
+        type: 'item',
+        label: 'apostrophe:commandMenuExitManager',
+        action: {},
+        shortcut: '',
+        modal: 'article:manager'
+      }
+    },
+    modal: {
+      'article:manager': {
+        '@apostrophecms/command-menu:manager': {
+          label: null,
+          commands: [
+            'article:create-new',
+            'article:search',
+            'article:select-all',
+            'article:archive-selected',
+            'article:exit-manager'
+          ]
+        }
+      }
+    }
+  }
+};
+const topic = {
+  commands: {
+    add: {
+      'topic:create-new': {
+        type: 'item',
+        label: 'apostrophe:commandMenuCreateNew',
+        action: {},
+        shortcut: ''
+      },
+      'topic:search': {
+        type: 'item',
+        label: 'apostrophe:commandMenuSearch',
+        action: {},
+        shortcut: ''
+      },
+      'topic:select-all': {
+        type: 'item',
+        label: 'apostrophe:commandMenuSelectAll',
+        action: {},
+        shortcut: ''
+      },
+      'topic:archive-selected': {
+        type: 'item',
+        label: 'apostrophe:commandMenuArchiveSelected',
+        action: {},
+        shortcut: ''
+      },
+      'topic:exit-manager': {
+        type: 'item',
+        label: 'apostrophe:commandMenuExitManager',
+        action: {},
+        shortcut: ''
+      }
+    },
+    modal: {
+      'topic:manager': {
+        '@apostrophecms/command-menu:manager': {
+          label: null,
+          commands: [
+            'topic:create-new',
+            'topic:search',
+            'topic:select-all',
+            'topic:archive-selected',
+            'topic:exit-manager'
+          ]
+        }
+      }
+    }
+  }
+};
+
+module.exports = {
+  moduleA,
+  moduleB,
+  moduleC,
+  moduleD,
+  article,
+  topic
+};