apostrophe 3.4.0 → 3.7.0

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

@@ -266,6 +266,9 @@ module.exports = {
       enableDeserializeUsers() {
         self.passport.deserializeUser(function (id, cb) {
           self.deserializeUser(id).then(function (user) {
+            if (user) {
+              user._viaSession = true;
+            }
             return cb(null, user);
           }).catch(cb);
         });
@@ -283,7 +286,12 @@ module.exports = {
 
       async deserializeUser(id) {
         const req = self.apos.task.getReq();
-        const user = await self.apos.user.find(req, { _id: id }).toObject();
+        const user = await self.apos.user.find(req, {
+          _id: id,
+          disabled: {
+            $ne: true
+          }
+        }).toObject();
         if (!user) {
           return null;
         }
@@ -357,21 +365,6 @@ module.exports = {
         return 1000 * 60 * 60 * (self.options.passwordResetHours || 48);
       },
 
-      // Invoked by passport after an authentication strategy succeeds
-      // and the user has been logged in. Invokes `loginAfterLogin` on
-      // any modules that have one and redirects to `req.redirect` or,
-      // if it is not set, to `/`.
-
-      async afterLogin(req, res) {
-        try {
-          await self.emit('after', req);
-        } catch (e) {
-          self.apos.util.error(e);
-          return res.redirect('/');
-        }
-        return res.redirect(req.redirect || '/');
-      },
-
       getBrowserData(req) {
         return {
           action: self.action,
@@ -390,7 +383,7 @@ module.exports = {
         const adminReq = self.apos.task.getReq();
         const user = await self.apos.user.find(adminReq, {}).relationships(false).limit(1).toObject();
 
-        if (!user) {
+        if (!user && !self.apos.options.test) {
           self.apos.util.warnDev('There are no users created for this installation of ApostropheCMS yet.');
         }
       },
@@ -408,10 +401,36 @@ module.exports = {
         before: '@apostrophecms/i18n',
         middleware: self.passport.initialize()
       },
+      passportExtendLogin: {
+        before: '@apostrophecms/i18n',
+        middleware(req, res, next) {
+          const superLogin = req.login.bind(req);
+          req.login = (user, callback) => {
+            return superLogin(user, (err) => {
+              if (err) {
+                return callback(err);
+              }
+              req.session.loginAt = Date.now();
+              return callback(null);
+            });
+          };
+          return next();
+        }
+      },
       passportSession: {
         before: '@apostrophecms/i18n',
         middleware: self.passport.session()
       },
+      honorLoginInvalidBefore: {
+        before: '@apostrophecms/i18n',
+        middleware(req, res, next) {
+          if (req.user && req.user._viaSession && req.user.loginInvalidBefore && ((!req.session.loginAt) || (req.session.loginAt < req.user.loginInvalidBefore))) {
+            req.session.destroy();
+            delete req.user;
+          }
+          return next();
+        }
+      },
       addUserToData: {
         before: '@apostrophecms/i18n',
         middleware(req, res, next) {

package/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue

@@ -37,6 +37,7 @@
                   type="primary"
                   label="apostrophe:login"
                   button-type="submit"
+                  class="apos-login__submit"
                   :modifiers="['gradient-on-hover', 'block']"
                   @click="submit"
                 />
@@ -121,6 +122,9 @@ export default {
   },
   methods: {
     async submit() {
+      if (this.busy) {
+        return;
+      }
       this.busy = true;
       this.error = '';
       try {
@@ -298,4 +302,8 @@ export default {
       margin-left: auto;
     }
   }
+
+  .apos-login__submit ::v-deep .apos-button {
+    height: 47px;
+  }
 </style>

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

@@ -260,7 +260,7 @@ module.exports = {
           // Intentionally emitted regardless of whether the site is new or not.
           //
           // This is the right time to park pages, for instance, because the
-          // database is guaranteed to be in a sane state, whether because the
+          // database is guaranteed to be in a stable state, whether because the
           // site is new or because migrations ran successfully.
           await self.emit('after');
         } finally {

package/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue

@@ -43,7 +43,11 @@
                 </h2>
                 <div class="apos-modal__controls--header" v-if="hasBeenLocalized || hasPrimaryControls">
                   <div class="apos-modal__locale" v-if="hasBeenLocalized">
-                    <span class="apos-modal__locale-label">{{ $t('apostrophe:locale')}}:</span> <span class="apos-modal__locale-name">{{ currentLocale }}</span>
+                    <span class="apos-modal__locale-label">
+                      {{ $t('apostrophe:locale') }}:
+                    </span> <span class="apos-modal__locale-name">
+                      {{ currentLocale }}
+                    </span>
                   </div>
                   <div class="apos-modal__controls--primary" v-if="hasPrimaryControls">
                     <slot name="primaryControls" />
@@ -447,9 +451,9 @@ export default {
     $height: 190px;
     top: 50%;
     bottom: -50%;
+    display: flex;
     height: $height;
     transform: translateY(math.div($height, 2) * -1);
-    display: flex;
     justify-content: center;
     align-items: center;
     text-align: center;

package/modules/@apostrophecms/modal/ui/apos/components/AposModalConfirm.vue

@@ -171,7 +171,7 @@ export default {
   right: auto;
   bottom: auto;
   left: auto;
-  width: 550px;
+  max-width: 700px;
   height: auto;
   text-align: center;
 }

package/modules/@apostrophecms/modal/ui/apos/mixins/AposEditorMixin.js

@@ -188,6 +188,12 @@ export default {
           dismiss: true
         });
       }
+    },
+    triggerValidate() {
+      this.triggerValidation = true;
+      this.$nextTick(async () => {
+        this.triggerValidation = false;
+      });
     }
 
   }

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

@@ -446,7 +446,7 @@ module.exports = {
       // By default browser data is pushed only for the `apos` scene, so public
       // site pages will not be cluttered with it, except on the /login page and
       // other pages that opt into the `apos` scene. If `scene` is set to `public`
-      // then the data is available al the time.
+      // then the data is available all the time.
       //
       // Be sure to use `extendMethods` when implementing `getBrowserData`
       // as your base class may also implement `getBrowserData`.

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

@@ -234,7 +234,7 @@ module.exports = {
         }
         permissions.push({
           name: 'edit',
-          label: module.options.singleton ? 'Modify' : 'Modify / Delete',
+          label: module.options.singleton ? 'apostrophe:modify' : 'apostrophe:modifyOrDelete',
           value: self.can(req, 'edit', module.name)
         });
         permissions.push({

package/modules/@apostrophecms/permission/ui/apos/components/AposInputRole.vue

@@ -126,7 +126,6 @@ export default {
       const list = document.createElement('ul');
       const intro = document.createElement('p');
       const followUp = document.createElement('p');
-      const link = document.createElement('a');
       intro.appendChild(document.createTextNode(this.$t('apostrophe:piecePermissionsIntro')));
       followUp.appendChild(document.createTextNode(this.$t('apostrophe:piecePermissionsPieceTypeList')));
       html.appendChild(intro);
@@ -137,7 +136,10 @@ export default {
         list.appendChild(li);
       });
       html.appendChild(list);
-      return { content: html, localize: false };
+      return {
+        content: html,
+        localize: false
+      };
     },
     validate(value) {
       if (this.field.required && !value.length) {

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue

@@ -211,7 +211,10 @@ export default {
       // Add computed singular label to context menu
       this.moreMenu.menu.unshift({
         action: 'new',
-        label: `New ${this.moduleLabels.singular}`
+        label: {
+          key: 'apostrophe:newDocType',
+          type: this.$t(this.moduleLabels.singular)
+        }
       });
     }
     apos.bus.$on('content-changed', this.getPieces);

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue

@@ -26,7 +26,7 @@
         <th class="apos-table__header" key="contextMenu">
           <component
             :is="getEl({})"
-            class="apos-table__header-label is-hidden"
+            class="apos-table__header-label apos-is-hidden"
           >
             {{ $t('apostrophe:moreOperations') }}
           </component>

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue

@@ -26,9 +26,8 @@
       </AposContextMenuDialog>
     </bubble-menu>
     <div class="apos-rich-text-editor__editor" :class="editorModifiers">
-      <editor-content :editor="editor" :class="moduleOptions.className" />
+      <editor-content :editor="editor" :class="editorOptions.className" />
     </div>
-    <!-- Using actual DOM element rather than :after to ease localization -->
     <div class="apos-rich-text-editor__editor_after" :class="editorModifiers">
       {{ $t('apostrophe:emptyRichTextWidget') }}
     </div>
@@ -103,11 +102,27 @@ export default {
 
       activeOptions.styles = this.enhanceStyles(activeOptions.styles || this.defaultOptions.styles);
 
+      activeOptions.className = (activeOptions.className !== undefined)
+        ? activeOptions.className : this.moduleOptions.className;
+
       return activeOptions;
     },
-
+    autofocus() {
+      // Only true for a new rich text widget
+      return !this.stripPlaceholderBrs(this.value.content).length;
+    },
     initialContent() {
-      return this.stripPlaceholderBrs(this.value.content);
+      const content = this.stripPlaceholderBrs(this.value.content);
+      if (!content.length) {
+        // If we don't supply a valid instance of the first style, then
+        // the text align control will not work until the user manually
+        // applies a style or refreshes the page
+        const defaultStyle = this.editorOptions.styles.find(style => style.def);
+        const _class = defaultStyle.class ? ` class="${defaultStyle.class}"` : '';
+        return `<${defaultStyle.tag}${_class}></${defaultStyle.tag}>`;
+      } else {
+        return content;
+      }
     },
     toolbar() {
       return this.editorOptions.toolbar;
@@ -136,7 +151,7 @@ export default {
     aposTiptapExtensions() {
       return (apos.tiptapExtensions || [])
         .map(extension => extension({
-          styles: this.editorOptions.styles,
+          styles: this.editorOptions.styles.map(this.localizeStyle),
           types: this.tiptapTypes
         }));
     }
@@ -153,7 +168,7 @@ export default {
   mounted() {
     this.editor = new Editor({
       content: this.initialContent,
-      autofocus: !this.initialContent,
+      autofocus: this.autofocus,
       onUpdate: this.editorUpdate,
       extensions: [
         StarterKit,
@@ -217,7 +232,6 @@ export default {
     // commands and parameters used internally.
     enhanceStyles(styles) {
       const self = this;
-      const enhanced = [];
       (styles || []).forEach(style => {
         style.options = {};
         for (const key in self.tiptapTextCommands) {
@@ -242,9 +256,7 @@ export default {
           style.options.class = style.class;
         }
 
-        if (style.type) {
-          enhanced.push(style);
-        } else {
+        if (!style.type) {
           apos.notify('apostrophe:richTextStyleConfigWarning', {
             type: 'warning',
             dismiss: true,
@@ -256,7 +268,27 @@ export default {
           });
         }
       });
+
+      // ensure a default so we can rely on it throughout
+      const hasDefault = !!styles.find(style => style.def);
+      if (!hasDefault && styles.length) {
+        // If no dev set default, use the first paragraph we can find
+        if (styles.filter(style => style.type === 'paragraph').length) {
+          styles.filter(style => style.type === 'paragraph')[0].def = true;
+        } else {
+          // Otherwise, set the first style
+          styles[0].def = true;
+        }
+      }
       return styles;
+    },
+    localizeStyle(style) {
+      style.label = this.$t(style.label);
+
+      return {
+        ...style,
+        label: this.$t(style.label)
+      };
     }
   }
 };

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposTiptapStyles.vue

@@ -52,6 +52,9 @@ export default {
         const style = styles[i];
         if (this.editor.isActive(style.type, (style.options || {}))) {
           return i;
+        } else if (this.editor.state.selection.$head.parent.type.name === 'defaultNode' && style.def) {
+          // Look deeper to see if custom defaultNode is active
+          return i;
         }
       }
       return 0;

package/modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Classes.js

@@ -25,9 +25,7 @@ export default (options) => {
                 const tag = element.tagName.toLowerCase();
                 // This tag is not configured
                 if (!allow[tag]) {
-                  return {
-                    class: null
-                  };
+                  return null;
                 }
                 const classes = (element.getAttribute('class') || '')
                   .split(' ')
@@ -36,13 +34,11 @@ export default (options) => {
                 // If no valid classes for this parse, default to the
                 // the first setting for this tag (including null for tags defined without classes).
                 // else, remove classes.
-                return {
-                  class: classes.length
-                    ? classes.join(' ')
-                    : (
-                      allow[tag].length ? allow[tag][0] : null
-                    )
-                };
+                return classes.length
+                  ? classes.join(' ')
+                  : (
+                    allow[tag].length ? allow[tag][0] : null
+                  );
               }
             }
           }

package/modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Default.js

@@ -0,0 +1,64 @@
+// If a style has been marked `def`, we need to make sure it
+// and it's attributes are prioritized in our editor.
+// It's easier to create a new Node with our specifications and put it
+// at the front of the line than try to infer between editor instantiation
+// and the editor-user setting styles via the toolbar to know when its needed.
+
+import { Node } from '@tiptap/core';
+import Heading from '@tiptap/extension-heading';
+import Paragraph from '@tiptap/extension-paragraph';
+
+const nodeMap = {
+  heading: Heading,
+  paragraph: Paragraph
+};
+
+export default (options) => {
+  const def = options.styles.filter(style => style.def)[0];
+
+  // Configuration has a default style
+  if (def) {
+    const nodeName = 'defaultNode';
+    const attrs = {
+      class: def.options.class || null
+    };
+
+    if (def.type === 'heading' || def.type === 'paragraph') {
+      return nodeMap[def.type].extend({
+        name: nodeName,
+        defaultOptions: {
+          HTMLAttributes: attrs,
+          levels: def.options.level ? [ def.options.level ] : null
+        }
+      });
+    }
+
+    if (def.type === 'textStyle') {
+      return Node.create({
+        group: 'block',
+        content: 'text*',
+        name: nodeName,
+        defaultOptions: {
+          HTMLAttributes: attrs
+        },
+        renderHTML: () => {
+          return [ 'span', attrs, 0 ];
+        },
+        parseHTML() {
+          return [
+            {
+              tag: 'span',
+              getAttrs: element => {
+                const hasStyles = element.hasAttribute('style');
+                if (!hasStyles) {
+                  return false;
+                }
+                return {};
+              }
+            }
+          ];
+        }
+      });
+    }
+  }
+};

package/modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Document.js

@@ -0,0 +1,15 @@
+// Acts as a custom Document extension
+import { Node } from '@tiptap/core';
+export default (options) => {
+  const def = options.styles.filter(style => style.def)[0];
+  let content = 'block+'; // one or more block nodes (default Document setting)
+  if (def) {
+    // one/more defaultNodes (created in ./Default) or one/more other block nodes
+    content = '(defaultNode|block)+';
+  }
+  return Node.create({
+    name: 'doc',
+    topNode: true,
+    content
+  });
+};

package/modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Heading.js

@@ -0,0 +1,23 @@
+// Lock Heading levels down to just those provided via configuration
+import Heading from '@tiptap/extension-heading';
+
+export default (options) => {
+  const headings = options.styles.filter(style => style.type === 'heading');
+  const levels = headings.map(heading => heading.options.level);
+  const defaultLevel = headings.filter(heading => heading.def).length
+    ? headings.filter(heading => heading.def)[0].options.level
+    : levels[0];
+  return Heading.extend({
+    defaultOptions: {
+      levels
+    },
+    addAttributes() {
+      return {
+        level: {
+          default: defaultLevel,
+          rendered: false
+        }
+      };
+    }
+  });
+};