Add v2.6.0

Author: YannickRe

core/built/assets/ghost-dark-09a4ad1ce73f34d44589e5e40313318a.css

@@ -15,7 +15,8 @@ const http = (apiImpl) => {
             user: req.user,
             context: {
                 api_key_id: (req.api_key && req.api_key.id) ? req.api_key.id : null,
-                user: ((req.user && req.user.id) || (req.user && models.User.isExternalUser(req.user.id))) ? req.user.id : null
+                user: ((req.user && req.user.id) || (req.user && models.User.isExternalUser(req.user.id))) ? req.user.id : null,
+                member: (req.member || null)
             }
         });
 

core/built/assets/ghost-dark-280bfac1d9a1c21f0171d2b7c6c73c89.css

@@ -0,0 +1,37 @@
+const _ = require('lodash');
+const utils = require('../../../schema/fixtures/utils');
+const permissions = require('../../../../services/permissions');
+const logging = require('../../../../lib/common/logging');
+
+const resources = ['webhook'];
+const _private = {};
+
+_private.getRelations = function getRelations(resource) {
+    return utils.findPermissionRelationsForObject(resource);
+};
+
+_private.printResult = function printResult(result, message) {
+    if (result.done === result.expected) {
+        logging.info(message);
+    } else {
+        logging.warn(`(${result.done}/${result.expected}) ${message}`);
+    }
+};
+
+module.exports.config = {
+    transaction: true
+};
+
+module.exports.up = (options) => {
+    const localOptions = _.merge({
+        context: {internal: true}
+    }, options);
+
+    return Promise.map(resources, (resource) => {
+        const relationToAdd = _private.getRelations(resource);
+
+        return utils.addFixturesForRelation(relationToAdd, localOptions)
+            .then(result => _private.printResult(result, `Adding permissions_roles fixtures for ${resource}s`))
+            .then(() => permissions.init(localOptions));
+    });
+};

core/built/assets/ghost.min-52a4ee573671c227e17e9f9f62bc4d5e.css

@@ -1,5 +1,6 @@
 const Promise = require('bluebird');
 const common = require('../common');
+const fs = require('fs-extra');
 
 /**
  * @NOTE: Sharp cannot operate on the same image path, that's why we have to use in & out paths.
@@ -8,15 +9,10 @@ const common = require('../common');
  * https://github.com/lovell/sharp/issues/1360.
  */
 const process = (options = {}) => {
-    let sharp, img;
+    let sharp, img, originalData, originalSize;
 
     try {
         sharp = require('sharp');
-
-        // @NOTE: workaround for Windows as libvips keeps a reference to the input file
-        //        which makes it impossible to fs.unlink() it on cleanup stage
-        sharp.cache(false);
-        img = sharp(options.in);
     } catch (err) {
         return Promise.reject(new common.errors.InternalServerError({
             message: 'Sharp wasn\'t installed',
@@ -25,18 +21,36 @@ const process = (options = {}) => {
         }));
     }
 
-    return img.metadata()
+    // @NOTE: workaround for Windows as libvips keeps a reference to the input file
+    //        which makes it impossible to fs.unlink() it on cleanup stage
+    sharp.cache(false);
+
+    return fs.readFile(options.in)
+        .then((data) => {
+            originalData = data;
+
+            // @NOTE: have to use constructor with Buffer for sharp to be able to expose size property
+            img = sharp(data);
+        })
+        .then(() => img.metadata())
         .then((metadata) => {
+            originalSize = metadata.size;
+
             if (metadata.width > options.width) {
                 img.resize(options.width);
             }
 
             // CASE: if you call `rotate` it will automatically remove the orientation (and all other meta data) and rotates
             //       based on the orientation. It does not rotate if no orientation is set.
             img.rotate();
+            return img.toBuffer({resolveWithObject: true});
         })
-        .then(() => {
-            return img.toFile(options.out);
+        .then(({data, info}) => {
+            if (info.size > originalSize) {
+                return fs.writeFile(options.out, originalData);
+            } else {
+                return fs.writeFile(options.out, data);
+            }
         })
         .catch((err) => {
             throw new common.errors.InternalServerError({

core/built/assets/ghost.min-6ec029bbb20e60039f2218cb1dfbda7c.css

@@ -5,10 +5,14 @@ var moment = require('moment-timezone'),
     sequence = require('../../lib/promise/sequence');
 
 /**
+ * @TODO REMOVE WHEN v0.1 IS DROPPED
  * WHEN access token is created we will update last_seen for user.
  */
 common.events.on('token.added', function (tokenModel) {
-    models.User.edit({last_seen: moment().toDate()}, {id: tokenModel.get('user_id')})
+    models.User.findOne({id: tokenModel.get('user_id')})
+        .then(function (user) {
+            return user.updateLastSeen();
+        })
         .catch(function (err) {
             common.logging.error(new common.errors.GhostError({err: err, level: 'critical'}));
         });

core/built/assets/ghost.min-a9c5dcce8b8513b4e711b19a2b5fd06d.js core/built/assets/ghost.min-e2b6c53a249cb6882852db3ebfc9829b.js

@@ -259,6 +259,11 @@ User = ghostBookshelf.Model.extend({
         });
     },
 
+    updateLastSeen: function updateLastSeen() {
+        this.set({last_seen: new Date()});
+        return this.save();
+    },
+
     enforcedFilters: function enforcedFilters(options) {
         if (options.context && options.context.internal) {
             return null;
@@ -756,7 +761,7 @@ User = ghostBookshelf.Model.extend({
         var self = this;
 
         return this.getByEmail(object.email)
-            .then(function then(user) {
+            .then((user) => {
                 if (!user) {
                     throw new common.errors.NotFoundError({
                         message: common.i18n.t('errors.models.user.noUserWithEnteredEmailAddr')
@@ -776,12 +781,15 @@ User = ghostBookshelf.Model.extend({
                 }
 
                 return self.isPasswordCorrect({plainPassword: object.password, hashedPassword: user.get('password')})
-                    .then(function then() {
-                        user.set({status: 'active', last_seen: new Date()});
+                    .then(() => {
+                        return user.updateLastSeen();
+                    })
+                    .then(() => {
+                        user.set({status: 'active'});
                         return user.save();
                     });
             })
-            .catch(function (err) {
+            .catch((err) => {
                 if (err.message === 'NotFound' || err.message === 'EmptyResponse') {
                     throw new common.errors.NotFoundError({
                         message: common.i18n.t('errors.models.user.noUserWithEnteredEmailAddr')

core/built/assets/img/buffer-db31f6b5dc27a298050e16312619c586.png

@@ -4,6 +4,7 @@ const models = require('../../models');
 const common = require('../../lib/common');
 const session = require('./session');
 const apiKeyAuth = require('./api-key');
+const members = require('./members');
 
 const authenticate = {
     // ### Authenticate Client Middleware
@@ -103,7 +104,7 @@ const authenticate = {
 
     // ### v2 API auth middleware
     authenticateAdminAPI: [session.safeGetSession, session.getUser],
-    authenticateContentApiKey: apiKeyAuth.content.authenticateContentApiKey
+    authenticateContentApi: [apiKeyAuth.content.authenticateContentApiKey, members.authenticateMembersToken]
 };
 
 module.exports = authenticate;

core/built/assets/img/disqus.svg

@@ -38,7 +38,18 @@ const authorize = {
     },
 
     authorizeAdminAPI: [session.ensureUser],
-    // used by API v2 endpoints
+    authorizeContentApi(req, res, next) {
+        const hasApiKey = req.api_key && req.api_key.id;
+        const hasMember = req.member;
+        if (hasApiKey) {
+            return next();
+        }
+        if (labs.isSet('members') && hasMember) {
+            return next();
+        }
+        return next(new common.errors.NoPermissionError({message: common.i18n.t('errors.middleware.auth.pleaseSignInOrAuthenticate')}));
+    },
+
     requiresAuthorizedUserOrApiKey(req, res, next) {
         const hasUser = req.user && req.user.id;
         const hasApiKey = req.api_key && req.api_key.id;

core/built/assets/img/google-analytics-e05fc1327377939663407200d4978eba.png

@@ -0,0 +1,28 @@
+const jwt = require('jsonwebtoken');
+const common = require('../../../lib/common');
+
+const authenticateMembersToken = (req, res, next) => {
+    if (!req.get('authorization')) {
+        return next();
+    }
+
+    const [scheme, credentials] = req.get('authorization').split(/\s+/);
+
+    if (scheme !== 'GhostMembers') {
+        return next();
+    }
+
+    return jwt.verify(credentials, null, {
+        algorithms: ['none']
+    }, function (err, claims) {
+        if (err) {
+            return next(new common.errors.UnauthorizedError({err}));
+        }
+        req.member = claims;
+        return next();
+    });
+};
+
+module.exports = {
+    authenticateMembersToken
+};

core/built/assets/img/mailchimp-638c097949c32c249c690c8ff927ee9d.png

@@ -1,11 +1,18 @@
-var settingsCache = require('./settings/cache'),
-    _ = require('lodash'),
-    Promise = require('bluebird'),
-    SafeString = require('./themes/engine').SafeString,
-    common = require('../lib/common'),
-    labs = module.exports = {};
+const settingsCache = require('./settings/cache');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const SafeString = require('./themes/engine').SafeString;
+const common = require('../lib/common');
+const config = require('../config');
+let labs = module.exports = {};
 
 labs.isSet = function isSet(flag) {
+    /**
+     * TODO: Uses hard-check for members prototype, removed here when added to settings
+     */
+    if (flag === 'members' && config.get('enableDeveloperExperiments')) {
+        return true;
+    }
     var labsConfig = settingsCache.get('labs');
     return labsConfig && labsConfig[flag] && labsConfig[flag] === true;
 };

core/built/assets/img/more-fe5480ab76c7be7aec28bcfe844f41c1.png

@@ -77,7 +77,7 @@ _private.validateData = function validateData(object) {
             type: ['read', 'browse'],
             resource: _.map(RESOURCE_CONFIG.QUERY, 'resource')
         };
-        const allowedQueryOptions = ['limit', 'filter', 'include', 'slug', 'visibility', 'status'];
+        const allowedQueryOptions = ['limit', 'order', 'filter', 'include', 'slug', 'visibility', 'status'];
         const allowedRouterOptions = ['redirect', 'slug'];
         const defaultRouterOptions = {
             redirect: true

core/built/assets/img/revue.svg

@@ -4,6 +4,8 @@ var common = require('../lib/common'),
     urlService = require('../services/url'),
     settingsCache = require('./settings/cache'),
     schema = require('../data/schema').checks,
+    moment = require('moment'),
+
     defaultPostSlugs = [
         'welcome',
         'the-editor',
@@ -22,13 +24,18 @@ function getSlackSettings() {
 }
 
 function ping(post) {
-    var message,
+    let message,
+        title,
+        author,
         slackData = {},
-        slackSettings = getSlackSettings();
+        slackSettings = getSlackSettings(),
+        blogTitle = settingsCache.get('title');
 
     // If this is a post, we want to send the link of the post
     if (schema.isPost(post)) {
         message = urlService.getUrlByResourceId(post.id, {absolute: true});
+        title = post.title ? post.title : null;
+        author = post.authors ? post.authors[0] : null;
     } else {
         message = post.message;
     }
@@ -48,12 +55,56 @@ function ping(post) {
             return;
         }
 
-        slackData = {
-            text: message,
-            unfurl_links: true,
-            icon_url: imageLib.blogIcon.getIconUrl(true),
-            username: 'Ghost'
-        };
+        if (schema.isPost(post)) {
+            slackData = {
+                // We are handling the case of test notification here by checking
+                // if it is a post or a test message to check webhook working.
+                text: `Notification from *${blogTitle}* :ghost:`,
+                unfurl_links: true,
+                icon_url: imageLib.blogIcon.getIconUrl(true),
+                username: 'Ghost',
+                // We don't want to send attachment if it is a test notification.
+                attachments: [
+                    {
+                        fallback: 'Sorry, content cannot be shown.',
+                        title: title,
+                        title_link: message,
+                        author_name: blogTitle,
+                        image_url: post ? urlService.utils.urlFor('image', {image: post.feature_image}, true) : null,
+                        color: '#008952',
+                        fields: [
+                            {
+                                title: 'Description',
+                                value: post.custom_excerpt ? post.custom_excerpt : `${post.html.replace(/<[^>]+>/g, '').split('.').slice(0, 3).join('.')}.`,
+                                short: false
+                            }
+                        ]
+                    },
+                    {
+                        fallback: 'Sorry, content cannot be shown.',
+                        color: '#008952',
+                        thumb_url: author ? urlService.utils.urlFor('image', {image: author.profile_image}, true) : null,
+                        fields: [
+                            {
+                                title: 'Author',
+                                value: author ? `<${urlService.getUrlByResourceId(author.id, {absolute: true})} | ${author.name}>` : null,
+                                short: true
+                            }
+                        ],
+                        footer: blogTitle,
+                        footer_icon: imageLib.blogIcon.getIconUrl(true),
+                        ts: moment().unix()
+                    }
+                ]
+            };
+        } else {
+            slackData = {
+                text: message,
+                unfurl_links: true,
+                icon_url: imageLib.blogIcon.getIconUrl(true),
+                username: 'Ghost'
+            };
+        }
 
         return request(slackSettings.url, {
             body: JSON.stringify(slackData),

core/built/assets/img/typeform.svg

@@ -60,6 +60,15 @@ themeMiddleware.updateTemplateData = function updateTemplateData(req, res, next)
         labsData = _.cloneDeep(settingsCache.get('labs')),
         themeData = {};
 
+    /**
+     * TODO: Uses hard-check for members prototype, removed here when added to settings
+    */
+    if (config.get('enableDeveloperExperiments')) {
+        Object.assign(labsData, {
+            members: true
+        });
+    }
+
     if (activeTheme.get()) {
         themeData.posts_per_page = activeTheme.get().config('posts_per_page');
     }