Add v3.35.0

YannickRe · Sep 30, 2020 · 54dd69d · 54dd69d
1 parent c83f1cb
commit 54dd69d
Show file tree

Hide file tree

Showing 93 changed files with 1,204 additions and 2,686 deletions.
diff --git a/...dark-8d182e7eddeb24907d166c6ad3eb24a2.css → ...dark-d3c7ce4584a6196f9425be8c7170e788.css b/...dark-8d182e7eddeb24907d166c6ad3eb24a2.css → ...dark-d3c7ce4584a6196f9425be8c7170e788.css
diff --git a/...t.min-259151d0b5b21fc561f490072435c634.js → ...t.min-43efb006eed9b4e03853b4712d1969a3.js b/...t.min-259151d0b5b21fc561f490072435c634.js → ...t.min-43efb006eed9b4e03853b4712d1969a3.js
diff --git a/....min-9edc4c10f8f6a41935e9699a131a13e7.css → ....min-8049f82d5dfa6ba4962a57bb9d6ccb62.css b/....min-9edc4c10f8f6a41935e9699a131a13e7.css → ....min-8049f82d5dfa6ba4962a57bb9d6ccb62.css
diff --git a/core/built/assets/icons/portal-icon-3.svg b/core/built/assets/icons/portal-icon-3.svg
diff --git a/core/built/assets/icons/portal-icon-4.svg b/core/built/assets/icons/portal-icon-4.svg
diff --git a/...r.min-282049bc47541e65478dbcc6234e9fa0.js → ...r.min-24cebaf2c31bc6f1282dea73ffa15f9f.js b/...r.min-282049bc47541e65478dbcc6234e9fa0.js → ...r.min-24cebaf2c31bc6f1282dea73ffa15f9f.js
diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js
@@ -44,7 +44,7 @@ function getMembersHelper() {
 
     let membersHelper = `<script defer src="${getAssetUrl('public/members.js', true)}"></script>`;
     if (config.get('enableDeveloperExperiments') || config.get('portal')) {
-        membersHelper = `<script defer src="https://unpkg.com/@tryghost/members-js@latest/umd/members.min.js" data-ghost="${urlUtils.getSiteUrl()}"></script>`;
+        membersHelper = `<script defer src="https://unpkg.com/@tryghost/portal@latest/umd/portal.min.js" data-ghost="${urlUtils.getSiteUrl()}"></script>`;
         membersHelper += (`<style type='text/css'> ${templateStyles}</style>`);
     }
     if ((!!stripeDirectSecretKey && !!stripeDirectPublishableKey) || !!stripeConnectAccountId) {

diff --git a/core/frontend/services/routing/RSSRouter.js b/core/frontend/services/routing/RSSRouter.js
@@ -28,7 +28,7 @@ class RSSRouter extends ParentRouter {
     }
 
     /**
-     * @description Simple controller function to redirect /rss to /feed
+     * @description Simple controller function to redirect /feed to /rss
      * @param {Object} req
      * @param {Object}res
      * @private

diff --git a/core/server/api/canary/email-preview.js b/core/server/api/canary/email-preview.js
@@ -31,16 +31,17 @@ module.exports = {
                         });
                     }
 
-                    return mega.postEmailSerializer.serialize(model, {isBrowserPreview: true}).then(({emailTmpl, replacements}) => {
-                        // perform replacements using no member data
+                    return mega.postEmailSerializer.serialize(model, {isBrowserPreview: true}).then((emailContent) => {
+                        const replacements = mega.postEmailSerializer.parseReplacements(emailContent);
+
                         replacements.forEach((replacement) => {
-                            emailTmpl[replacement.format] = emailTmpl[replacement.format].replace(
+                            emailContent[replacement.format] = emailContent[replacement.format].replace(
                                 replacement.match,
                                 replacement.fallback || ''
                             );
                         });
 
-                        return emailTmpl;
+                        return emailContent;
                     });
                 });
         }

diff --git a/core/server/api/canary/members.js b/core/server/api/canary/members.js
@@ -32,12 +32,15 @@ const sanitizeInput = async (members) => {
     let invalidCount = 0;
 
     const jsonSchema = require('./utils/validators/utils/json-schema');
-    const schema = require('./utils/validators/input/schemas/members-upload');
-    const definitions = require('./utils/validators/input/schemas/members');
 
     let invalidValidationCount = 0;
     try {
-        await jsonSchema.validate(schema, definitions, members);
+        await jsonSchema.validate({
+            docName: 'members',
+            method: 'upload'
+        }, {
+            data: members
+        });
     } catch (error) {
         if (error.errorDetails && error.errorDetails.length) {
             const jsonPointerIndexRegex = /\[(?<index>\d+)\]/;
@@ -162,12 +165,8 @@ module.exports = {
         async query(frame) {
             frame.options.withRelated = ['labels', 'stripeSubscriptions', 'stripeSubscriptions.customer'];
             const page = await membersService.api.members.list(frame.options);
-            const members = page.data.map(model => model.toJSON(frame.options));
 
-            return {
-                members: members,
-                meta: page.meta
-            };
+            return page;
         }
     },
 
@@ -189,7 +188,7 @@ module.exports = {
                 });
             }
 
-            return model.toJSON(frame.options);
+            return model;
         }
     },
 
@@ -237,7 +236,7 @@ module.exports = {
                     await membersService.api.sendEmailWithMagicLink({email: member.get('email'), requestedType: frame.options.email_type});
                 }
 
-                return member.toJSON(frame.options);
+                return member;
             } catch (error) {
                 if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
                     throw new errors.ValidationError({
@@ -302,7 +301,7 @@ module.exports = {
 
                 await member.load(['stripeSubscriptions.customer']);
 
-                return member.toJSON(frame.options);
+                return member;
             } catch (error) {
                 if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
                     throw new errors.ValidationError({
@@ -360,7 +359,7 @@ module.exports = {
                 });
             }
 
-            return model.toJSON(frame.options);
+            return model;
         }
     },
 
@@ -399,7 +398,10 @@ module.exports = {
 
     exportCSV: {
         options: [
-            'limit'
+            'limit',
+            'filter',
+            'search',
+            'paid'
         ],
         headers: {
             disposition: {
@@ -420,12 +422,8 @@ module.exports = {
         async query(frame) {
             frame.options.withRelated = ['labels', 'stripeSubscriptions', 'stripeSubscriptions.customer'];
             const page = await membersService.api.members.list(frame.options);
-            const members = page.data.map(model => model.toJSON(frame.options));
 
-            return {
-                members: members,
-                meta: page.meta
-            };
+            return page;
         }
     },
 

diff --git a/core/server/api/canary/utils/serializers/output/emails.js b/core/server/api/canary/utils/serializers/output/emails.js
@@ -1,7 +1,9 @@
+const mapper = require('./utils/mapper');
+
 module.exports = {
     read(email, apiConfig, frame) {
         frame.response = {
-            emails: [email.toJSON(frame.options)]
+            emails: [mapper.mapEmail(email, frame)]
         };
     },