apostrophe 4.1.0 → 4.2.0

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 4.2.0 (2024-04-18)
+
+* Typing a `/` in the title field of a page no longer confuses the slug field. Thanks to [Gauav Kumar](https://github.com/gkumar9891).
+
+### Changes
+
+* Rich text styles are now split into Nodes and Marks, with independent toolbar controls for a better user experience when applying text styles.
+There is no change in how the `styles` option is configured.
+* Rich text style labels are fully localized.
+* `i18n` module now uses the regular `req.redirect` instead of a direct `res.redirect` to ensure redirection, enabling more possibilities for `@apostrophecms/redirect` module
+* Refactors `AposModal` component with composition api to get rid of duplicated code in `AposFocusMixin` and `AposFocus`.
+* `APOS_MONGODB_LOG_LEVEL` has been removed. According to [mongodb documentation](https://github.com/mongodb/node-mongodb-native/blob/main/etc/notes/CHANGES_5.0.0.md#mongoclientoptionslogger-and-mongoclientoptionsloglevel-removed) "Both the logger and the logLevel options had no effect and have been removed."
+* Update `connect-mongo` to `5.x`. Add `@apostrophecms/emulate-mongo-3-driver` dependency to keep supporting `mongodb@3.x` queries while using `mongodb@6.x`.
+
+### Fixes
+
+* Updates the docs `beforeInsert` handler to avoid ending with different modes being set between `_id`, `aposLocale` and `aposMode`.
+* Adds a migration to fix potential corrupted data having different modes set between `_id`, `aposLocale` and `aposMode`.
+* Fix a crash in `notification` when `req.body` was not present. Thanks to Michelin for contributing this fix.
+* Addresses a console error observed when opening and closing the `@apostrophecms-pro/palette` module across various projects.
+* Fixes the color picker field in `@apostrophecms-pro/palette` module.
+* Ensures that the `data-apos-test` attribute in the admin bar's tray item buttons is set by passing the `action` prop to `AposButton`.
+* Prevents stripping of query parameters from the URL when the page is either switched to edit mode or reloaded while in edit mode.
+* Add the missing `metaType` property to newly inserted widgets.
+
+### Security
+
+* New passwords are now hashed with `scrypt`, the best password hash available in the Node.js core `crypto` module, following guidance from [OWASP](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).
+This reduces login time while improving overall security.
+* Old passwords are automatically re-hashed with `scrypt` on the next successful login attempt, which
+adds some delay to that next attempt, but speeds them up forever after compared to the old implementation.
+* Custom `scrypt` parameters for password hashing can be passed to the `@apostrophecms/user` module via the `scrypt` option. See the [Node.js documentation for `scrypt`]. Note that the `maxmem` parameter is computed automatically based on the other parameters.
+
+## 4.1.1 (2024-03-21)
+
+### Fixes
+
+* Hotfix for a bug that broke the rich text editor when the rich text widget has
+a `styles` property. The bug was introduced in 4.0.0 as an indirect side effect of deeper
+watching behavior by Vue 3.
+
 ## 4.1.0 (2024-03-20)
 
 ### Fixes
@@ -21,7 +62,7 @@ actually exists before calling `attachment.url` still lies with the developer.
 ## 4.0.0 (2024-03-12)
 
 ### Adds
-
+* Add Marks tool to the Rich Text widget for handling toggling marks.
 * Add translation keys used by the multisite assembly module.
 * Add side by side comparison support in AposSchema component.
 * Add `beforeLocalize` and `afterLocalize` events.

package/lib/mongodb-connect.js

@@ -1,4 +1,4 @@
-const mongo = require('mongodb');
+const mongo = require('@apostrophecms/emulate-mongo-3-driver');
 const dns = require('dns');
 
 // Connect to MongoDB, using the modern topology and parser, and

package/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposAdminBarMenu.vue

@@ -70,6 +70,7 @@
           :icon="item.options.icon"
           :icon-only="true"
           :label="item.label"
+          :action="item.action"
           :state="trayItemState[item.name] ? [ 'active' ] : []"
           @click="emitEvent(item.action)"
         />

package/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposContextBar.vue

@@ -383,6 +383,10 @@ export default {
       mode = mode || this.draftMode;
       locale = locale || apos.i18n.locale;
       doc = doc || this.context;
+      if (!doc) {
+        return;
+      }
+
       if ((mode === this.draftMode) && (locale === apos.i18n.locale)) {
         if ((this.context._id === doc._id) && (!this.urlDiffers(doc._url))) {
           return;
@@ -545,6 +549,7 @@ export default {
 
       if (this.urlDiffers(doc._url)) {
         // Slug changed, change browser URL to reflect the actual url of the doc
+        doc._url = doc._url + (window.location.search || '');
         history.replaceState(null, '', doc._url);
       }
 
@@ -557,17 +562,17 @@ export default {
         } : {})
       };
 
-      const content = await apos.http.get(doc._url, {
-        qs,
-        headers: {
-          'Cache-Control': 'no-cache'
-        },
-        draft: true,
-        busy: true,
-        prefix: false
-      });
-
-      refreshable.innerHTML = content;
+      if (doc._url) {
+        refreshable.innerHTML = await apos.http.get(doc._url, {
+          qs,
+          headers: {
+            'Cache-Control': 'no-cache'
+          },
+          draft: true,
+          busy: true,
+          prefix: false
+        });
+      }
 
       if (this.editMode && (!this.original)) {
         // the first time we enter edit mode on the page, we need to
@@ -691,13 +696,14 @@ export default {
       }
     },
     urlDiffers(url) {
-      // URL might or might not include hostname part
-      url = url.replace(/^https?:\/\/.*?\//, '/');
-      if (url === (window.location.pathname + (window.location.search || ''))) {
+      if (!url) {
         return false;
-      } else {
-        return true;
       }
+
+      const normalizedUrl = url.replace(/^https?:\/\/[^/]+\//, '/');
+      const currentPageUrl = window.location.pathname + window.location.search;
+
+      return normalizedUrl !== currentPageUrl;
     },
     lockNotAvailable() {
       if (this.contextStack.length) {

package/modules/@apostrophecms/area/index.js

@@ -622,7 +622,7 @@ module.exports = {
           widgetIsContextual[name] = manager.options.contextual;
           widgetHasPlaceholder[name] = manager.options.placeholder;
           widgetHasInitialModal[name] = !manager.options.placeholder && manager.options.initialModal !== false;
-          contextualWidgetDefaultData[name] = manager.options.defaultData;
+          contextualWidgetDefaultData[name] = manager.options.defaultData || {};
         });
 
         return {

package/modules/@apostrophecms/area/ui/apos/components/AposAreaEditor.vue

@@ -429,7 +429,9 @@ export default {
     },
     async update(widget) {
       widget.aposPlaceholder = false;
-
+      if (!widget.metaType) {
+        widget.metaType = 'widget';
+      }
       if (this.docId === window.apos.adminBar.contextId) {
         apos.bus.$emit('context-edited', {
           [`@${widget._id}`]: widget
@@ -513,6 +515,9 @@ export default {
       if (!widget._id) {
         widget._id = cuid();
       }
+      if (!widget.metaType) {
+        widget.metaType = 'widget';
+      }
       const push = {
         $each: [ widget ]
       };

package/modules/@apostrophecms/db/index.js

@@ -96,12 +96,6 @@ module.exports = {
           self.connectionReused = true;
           return;
         }
-        let Logger;
-        if (process.env.APOS_MONGODB_LOG_LEVEL) {
-          Logger = require('mongodb').Logger;
-          // Set debug level
-          Logger.setLevel(process.env.APOS_MONGODB_LOG_LEVEL);
-        }
         let uri = 'mongodb://';
         if (process.env.APOS_MONGODB_URI) {
           uri = process.env.APOS_MONGODB_URI;

package/modules/@apostrophecms/doc/index.js

@@ -37,8 +37,7 @@ module.exports = {
     self.apos.isNew = await self.detectNew();
     await self.createIndexes();
     self.addLegacyMigrations();
-    self.addCacheFieldMigration();
-    self.addSetPreviousDocsAposModeMigration();
+    self.addMigrations();
   },
   restApiRoutes(self) {
     return {
@@ -120,10 +119,23 @@ module.exports = {
       '@apostrophecms/doc-type:beforeInsert': {
         setLocaleAndMode(req, doc, options) {
           const manager = self.getManager(doc.type);
-          if (manager.isLocalized()) {
-            doc.aposLocale = doc.aposLocale || `${req.locale}:${req.mode}`;
-            doc.aposMode = req.mode;
+          if (!manager.isLocalized()) {
+            return;
+          }
+
+          if (doc._id) {
+            const [ _id, locale, mode ] = doc._id.split(':');
+            doc.aposLocale = `${locale}:${mode}`;
+            doc.aposMode = mode;
+            return;
           }
+
+          const [ locale, mode ] = doc.aposLocale
+            ? doc.aposLocale.split(':')
+            : [ req.locale, req.mode ];
+
+          doc.aposLocale = `${locale}:${mode}`;
+          doc.aposMode = mode;
         },
         testPermissionsAndAddIdAndCreatedAt(req, doc, options) {
           self.testInsertPermissions(req, doc, options);
@@ -1751,38 +1763,14 @@ module.exports = {
           }
         }
       },
-      // Add the "cacheInvalidatedAt" field to the documents that do not have it yet,
-      // and set it to equal doc.updatedAt.
-      setCacheField() {
-        return self.apos.migration.eachDoc({ cacheInvalidatedAt: { $exists: 0 } }, 5, async doc => {
-          await self.apos.doc.db.updateOne({ _id: doc._id }, {
-            $set: { cacheInvalidatedAt: doc.updatedAt }
-          });
-        });
-      },
-      addCacheFieldMigration() {
-        self.apos.migration.add('add-cache-invalidated-at-field', self.setCacheField);
-      },
-
-      async addSetPreviousDocsAposModeMigration () {
-        self.apos.migration.add('set-previous-docs-apos-mode', async () => {
-          await self.apos.doc.db.updateMany({
-            _id: { $regex: ':previous$' },
-            aposMode: { $ne: 'previous' }
-          }, {
-            $set: {
-              aposMode: 'previous'
-            }
-          });
-        });
-      },
 
       async bestAposDocId(criteria) {
         const existing = await self.apos.doc.db.findOne(criteria, { projection: { aposDocId: 1 } });
         return existing?.aposDocId || self.apos.util.generateId();
       },
 
-      ...require('./lib/legacy-migrations')(self)
+      ...require('./lib/legacy-migrations')(self),
+      ...require('./lib/migrations')(self)
     };
   }
 };

package/modules/@apostrophecms/doc/lib/migrations.js

@@ -0,0 +1,59 @@
+module.exports = (self) => {
+  return {
+    addMigrations() {
+      self.addCacheFieldMigration();
+      self.addSetPreviousDocsAposModeMigration();
+      self.addSetDocumentModesMigration();
+    },
+
+    addCacheFieldMigration() {
+      self.apos.migration.add('add-cache-invalidated-at-field', self.setCacheField);
+    },
+
+    async addSetPreviousDocsAposModeMigration () {
+      self.apos.migration.add('set-previous-docs-apos-mode', async () => {
+        await self.apos.doc.db.updateMany({
+          _id: { $regex: ':previous$' },
+          aposMode: { $ne: 'previous' }
+        }, {
+          $set: {
+            aposMode: 'previous'
+          }
+        });
+      });
+    },
+
+    addSetDocumentModesMigration() {
+      self.apos.migration.add('set-document-modes', async () => {
+        return self.apos.migration.eachDoc({}, 5, async (doc) => {
+          const manager = self.getManager(doc.type);
+          if (!manager.isLocalized()) {
+            return;
+          }
+          const idMode = doc._id.split(':').pop(); ;
+          const [ locale, localeMode ] = doc.aposLocale.split(':');
+          const aposMode = doc.aposMode;
+
+          if (idMode !== localeMode || idMode !== aposMode) {
+            await self.apos.doc.db.updateOne({ _id: doc._id }, {
+              $set: {
+                aposLocale: `${locale}:${idMode}`,
+                aposMode: idMode
+              }
+            });
+          }
+        });
+      });
+    },
+
+    // Add the "cacheInvalidatedAt" field to the documents that do not have it yet,
+    // and set it to equal doc.updatedAt.
+    setCacheField() {
+      return self.apos.migration.eachDoc({ cacheInvalidatedAt: { $exists: 0 } }, 5, async doc => {
+        await self.apos.doc.db.updateOne({ _id: doc._id }, {
+          $set: { cacheInvalidatedAt: doc.updatedAt }
+        });
+      });
+    }
+  };
+};

package/modules/@apostrophecms/doc-type/index.js

@@ -2703,8 +2703,11 @@ module.exports = {
               subquery.limit(undefined);
               subquery.page(undefined);
               subquery.perPage(undefined);
-              const mongo = await subquery.toMongo();
-              const count = await mongo.count();
+              await subquery.finalize();
+              const count = await self.apos.doc.db.countDocuments({
+                ...subquery.get('criteria'),
+                ...(subquery.get('lateCriteria') || {})
+              });
               if (query.get('perPage')) {
                 const perPage = query.get('perPage');
                 const totalPages = Math.ceil(count / perPage);

package/modules/@apostrophecms/express/index.js

@@ -554,12 +554,13 @@ module.exports = {
           }
           if (!sessionOptions.store.name) {
             // require from this module's dependencies
-            Store = require('connect-mongo')(expressSession);
+            const MongoStore = require('connect-mongo');
+            sessionOptions.store = MongoStore.create(sessionOptions.store.options);
           } else {
             // require from project's dependencies
             Store = self.apos.root.require(sessionOptions.store.name)(expressSession);
+            sessionOptions.store = new Store(sessionOptions.store.options);
           }
-          sessionOptions.store = new Store(sessionOptions.store.options);
         }
         // Exported for the benefit of code that needs to
         // interoperate in a compatible way with express-sessions

package/modules/@apostrophecms/i18n/i18n/de.json

@@ -339,13 +339,17 @@
   "richTextHorizontalRule": "Horizontale Linie",
   "richTextItalic": "Kursiv",
   "richTextLink": "Link",
+  "richTextMarkApplyStyles": "Stil anwenden",
+  "richTextMarkMultipleStyles": "Mehrere stile...",
+  "richTextMarkStyles": "Inline Stile",
+  "richTextNodeStyles": "Block Stile",
+  "richTextNodeMultipleStyles": "Mehrere blocks...",
   "richTextOrderedList": "Nummerierte Liste",
   "richTextParagraph": "Paragraph",
   "richTextPlaceholder": "Beginne dein Text hier...",
   "richTextRedo": "Wiederholen",
   "richTextStrikethrough": "Durchgestrichen",
   "richTextStyleConfigWarning": "Falsche Konfiguration des Text-Stiles: {{ label }}, {{ tag }}",
-  "richTextStyles": "Stile",
   "richTextUnderline": "Unterstrichen",
   "richTextUndo": "Rückgängig",
   "safeModeActive": "Sicherer Modus aktiv, HTML-Code wird nicht gerendert.",

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -398,6 +398,11 @@
   "richTextInsertMenuHeading": "Insert element...",
   "richTextItalic": "Italic",
   "richTextLink": "Link",
+  "richTextMarkApplyStyles": "Apply Styles",
+  "richTextMarkMultipleStyles": "Multiple Styles...",
+  "richTextMarkStyles": "Inline Styles",
+  "richTextNodeStyles": "Block Styles",
+  "richTextNodeMultipleStyles": "Multiple Blocks...",
   "richTextOrderedList": "Ordered List",
   "richTextParagraph": "Paragraph (P)",
   "richTextPlaceholder": "Start Typing Here...",
@@ -405,7 +410,6 @@
   "richTextRedo": "Redo",
   "richTextStrikethrough": "Strike",
   "richTextStyleConfigWarning": "Misconfigured rich text style: label: {{ label }}, {{ tag }}",
-  "richTextStyles": "Styles",
   "richTextUnderline": "Underline",
   "richTextUndo": "Undo",
   "safeModeActive": "Running in safe mode, not showing raw HTML.",

package/modules/@apostrophecms/i18n/i18n/es.json

@@ -324,13 +324,17 @@
   "richTextHorizontalRule": "Regla Horizontal",
   "richTextItalic": "Cursiva",
   "richTextLink": "Liga",
+  "richTextMarkApplyStyles": "Aplicar estilo",
+  "richTextMarkMultipleStyles": "Estilo múltiple...",
+  "richTextMarkStyles": "Estilos en línea",
+  "richTextNodeStyles": "Estilos en bloque",
+  "richTextNodeMultipleStyles": "Bloque múltiple...",
   "richTextOrderedList": "Lista Ordenada",
   "richTextParagraph": "Párrafo (P)",
   "richTextPlaceholder": "Comience a escribir aquí...",
   "richTextRedo": "Rehacer",
   "richTextStrikethrough": "Tachar",
   "richTextStyleConfigWarning": "Estilo de texto enriquecido mal configurado: etiqueta: {{ label }}, {{ tag }}",
-  "richTextStyles": "Estilos",
   "richTextUnderline": "Subrayar",
   "richTextUndo": "Deshacer",
   "safeModeActive": "Trabajando en modo seguro, HTML sin procesar no aparece.",

package/modules/@apostrophecms/i18n/i18n/fr.json

@@ -332,13 +332,17 @@
   "richTextHorizontalRule": "Règle Horizontale",
   "richTextItalic": "Italique",
   "richTextLink": "Lien",
+  "richTextMarkApplyStyles": "Appliquer le style",
+  "richTextMarkMultipleStyles": "Plusieurs styles...",
+  "richTextMarkStyles": "Styles de ligne",
+  "richTextNodeStyles": "Styles de bloc",
+  "richTextNodeMultipleStyles": "Plusieurs blocs...",
   "richTextOrderedList": "Liste numérotée",
   "richTextParagraph": "Paragraphe (P)",
   "richTextPlaceholder": "Commencez à écrire ici...",
   "richTextRedo": "Refaire",
   "richTextStrikethrough": "Barrer",
   "richTextStyleConfigWarning": "Style du Texte Riche mal configuré : label : {{ label }}, {{ tag }}",
-  "richTextStyles": "Styles",
   "richTextUnderline": "Souligner",
   "richTextUndo": "Annuler",
   "safeModeActive": "Fonctionne en mode sans échec, n'affiche pas le code HTML brut.",

package/modules/@apostrophecms/i18n/i18n/it.json

@@ -384,6 +384,11 @@
   "richTextInsertMenuHeading": "Inserisci elemento...",
   "richTextItalic": "Corsivo",
   "richTextLink": "Link",
+  "richTextMarkApplyStyles": "Applicare lo stile",
+  "richTextMarkMultipleStyles": "Stile multiplo...",
+  "richTextMarkStyles": "Stili in linea",
+  "richTextNodeStyles": "Stili di blocco",
+  "richTextNodeMultipleStyles": "Blocco multiplo...",
   "richTextOrderedList": "Lista ordinata",
   "richTextParagraph": "Paragrafo (P)",
   "richTextPlaceholder": "Inizia a scrivere qui...",
@@ -391,7 +396,6 @@
   "richTextRedo": "Ricomincia",
   "richTextStrikethrough": "Barrato",
   "richTextStyleConfigWarning": "Stile del rich-text configurato in modo errato: etichetta: {{ label }}, {{ tag }}",
-  "richTextStyles": "Stili",
   "richTextUnderline": "Sottolinea",
   "richTextUndo": "Annulla",
   "safeModeActive": "Esecuzione in modalità sicura, non visualizzando l'HTML grezzo.",

package/modules/@apostrophecms/i18n/i18n/pt-BR.json

@@ -321,13 +321,17 @@
   "richTextHorizontalRule": "Regra Horizontal",
   "richTextItalic": "Itálico",
   "richTextLink": "Link",
+  "richTextMarkApplyStyles": "Aplicar estilo",
+  "richTextMarkMultipleStyles": "Estilo múltiplo...",
+  "richTextMarkStyles": "Estilos incorporado",
+  "richTextNodeStyles": "Estilos de bloco",
+  "richTextNodeMultipleStyles": "Bloco múltiplo...",
   "richTextOrderedList": "Lista Ordenada",
   "richTextParagraph": "Parágrafo (P)",
   "richTextPlaceholder": "Comece a digitar aqui...",
   "richTextRedo": "Refazer",
   "richTextStrikethrough": "Tachar",
   "richTextStyleConfigWarning": "Estilo do editor desconfigurado: etiqueta: {{ label }}, {{ tag }}",
-  "richTextStyles": "Estilos",
   "richTextUnderline": "Sublinhar",
   "richTextUndo": "Desfazer",
   "safeModeActive": "Executando em modo de segurança, não mostrando HTML puro.",

package/modules/@apostrophecms/i18n/i18n/sk.json

@@ -336,13 +336,17 @@
   "richTextHorizontalRule": "Horizontálne pravítko",
   "richTextItalic": "Kurzíva",
   "richTextLink": "Link",
+  "richTextMarkApplyStyles": "Aplikovať štýl",
+  "richTextMarkMultipleStyles": "Viacnásobný štýl...",
+  "richTextMarkStyles": "Inline štýly",
+  "richTextNodeStyles": "Blokový štýly",
+  "richTextNodeMultipleStyles": "Viacnásobný Blokový...",
   "richTextOrderedList": "Číslovaný zoznam",
   "richTextParagraph": "Odstavec (P)",
   "richTextPlaceholder": "Začnite písať tu...",
   "richTextRedo": "Prerobiť",
   "richTextStrikethrough": "Preškrtnúť ",
   "richTextStyleConfigWarning": "Nesprávne nakonfigurovaný štýl: popiska: {{ label }}, {{ tag }}",
-  "richTextStyles": "Štýly",
   "richTextUnderline": "Podčiarknúť",
   "richTextUndo": "Vrátiť späť",
   "safeModeActive": "Beží v núdzovom režime, nezobrazuje sa zdrojový HTML.",

package/modules/@apostrophecms/i18n/index.js

@@ -309,7 +309,7 @@ module.exports = {
           // Remove locale prefix so URL parsing can proceed normally from here
           if (req.path === localeOptions.prefix) {
             // Add / for home page
-            return res.redirect(`${req.url}/`);
+            req.redirect = `${req.url}/`;
           }
           if (req.path.substring(0, localeOptions.prefix.length + 1) === localeOptions.prefix + '/') {
             req.path = req.path.replace(localeOptions.prefix, '');

package/modules/@apostrophecms/migration/index.js

@@ -115,6 +115,11 @@ module.exports = {
         // https://groups.google.com/forum/#!topic/mongodb-user/AFC1ia7MHzk
         const cursor = collection.find(criteria);
         cursor.sort({ _id: 1 });
+        // TODO use a variant of the code below instead
+        // cursor.batchSize(limit);
+        // for await (const docs of cursor) {
+        //   // await iterator(docs);
+        // }
         return require('util').promisify(broadband)(cursor, limit, async function (doc, cb) {
           try {
             await iterator(doc);

package/modules/@apostrophecms/modal/ui/apos/apps/AposModals.js

@@ -58,8 +58,8 @@ function onTopOf(el1, el2) {
   if (el2 === document) {
     return true;
   }
-  const index1 = apos.modal.stack.findIndex(modal => modal.$el === el1);
-  const index2 = apos.modal.stack.findIndex(modal => modal.$el === el2);
+  const index1 = apos.modal.stack.findIndex(modal => modal.modalEl === el1);
+  const index2 = apos.modal.stack.findIndex(modal => modal.modalEl === el2);
   if (index1 === -1) {
     throw new Error('apos.modal.onTopOf: el1 is not in the modal stack');
   }