Fixed gift preview redirect for invalid tokens

ghost/core/core/server/web/gift-preview/controller.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const errors = require('@tryghost/errors');
 const {generateGiftPreviewImage} = require('./image');
 
 function getCadenceLabel(cadence, duration) {
@@ -32,6 +33,10 @@ async function giftPreview(req, res) {
 
     try {
         gift = await giftService.getByToken(token);
+
+        if (!gift) {
+            throw new errors.NotFoundError({message: `Gift not found for token`});
+        }
     } catch (err) {
         logging.warn(`Gift preview: failed to load required gift data, redirecting to homepage`, err);
 

ghost/core/test/unit/server/web/gift-preview/controller.test.js

@@ -61,6 +61,18 @@ describe('Gift Preview Controller', function () {
             sinon.assert.calledWith(res.redirect, 302, 'https://example.com/');
         });
 
+        it('redirects to homepage when gift token is not found (null)', async function () {
+            sinon.stub(labs, 'isSet').withArgs('giftSubscriptions').returns(true);
+            giftServiceWrapper.service = {
+                getByToken: sinon.stub().resolves(null)
+            };
+
+            await controller.giftPreview(req, res);
+
+            sinon.assert.calledOnce(res.redirect);
+            sinon.assert.calledWith(res.redirect, 302, 'https://example.com/');
+        });
+
         it('returns HTML with OG tags for a valid gift', async function () {
             sinon.stub(labs, 'isSet').withArgs('giftSubscriptions').returns(true);
             giftServiceWrapper.service = {