TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed showing recommendations on custom welcome pages (#18864)

Browse Source 
no issue

When a custom welcome page is set for a tier, the recommendations modal
didn't show. If recommendations were disabled, there was also no toast
to confirm the sign up.

To fix this, we'll need to set the success and action query parameters
on the welcome page, but only if it is not an external site.
This commit is contained in:
Simon Backx 2023-11-03 16:02:46 +01:00 committed by GitHub
parent fee402a340
commit bf859c38ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghost/core/core/server/services/members/middleware.js
View File

@ -265,8 +265,16 @@ const createSessionFromMagicLink = async function createSessionFromMagicLink(req
const ensureEndsWith = (string, endsWith) => (string.endsWith(endsWith) ? string : string + endsWith);
const removeLeadingSlash = string => string.replace(/^\//, '');
// Add query parameters so the frontend can detect that the signup went fine
const redirectUrl = new URL(removeLeadingSlash(ensureEndsWith(customRedirect, '/')), ensureEndsWith(baseUrl, '/'));
if (urlUtils.isSiteUrl(redirectUrl)) {
// Add only for non-external URLs
redirectUrl.searchParams.set('success', 'true');
redirectUrl.searchParams.set('action', 'signup');
}
return res.redirect(redirectUrl.href);
}
}

49
ghost/core/test/e2e-api/members/signin.test.js
View File

@ -3,6 +3,7 @@ const models = require('../../../core/server/models');
const assert = require('assert/strict');
require('should');
const sinon = require('sinon');
const members = require('../../../core/server/services/members');
let membersAgent, membersService;
@ -64,7 +65,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
});
@ -75,7 +76,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup-paid`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-paid\/$/)
.expectHeader('Location', /\/welcome-paid\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
});
@ -86,10 +87,36 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=subscribe`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
});
it('Will redirect to an external welcome page for subscribe', async function () {
// Alter the product welcome page to an external URL
const freeProduct = await members.api.productRepository.get({slug: 'free'});
await members.api.productRepository.update({
id: freeProduct.id,
welcome_page_url: 'https://externalsite.ghost/welcome/'
});
try {
const magicLink = await membersService.api.getMagicLink('member1@test.com', 'signup');
const magicLinkUrl = new URL(magicLink);
const token = magicLinkUrl.searchParams.get('token');
await membersAgent.get(`/?token=${token}&action=subscribe`)
.expectStatus(302)
.expectHeader('Location', 'https://externalsite.ghost/welcome/') // no query params added
.expectHeader('Set-Cookie', /members-ssr.*/);
} finally {
// Change it back
await members.api.productRepository.update({
id: freeProduct.id,
welcome_page_url: freeProduct.get('welcome_page_url')
});
}
});
it('Will create a new member on signup', async function () {
const email = 'not-existent-member@test.com';
const magicLink = await membersService.api.getMagicLink(email, 'signup');
@ -98,7 +125,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
const member = await getMemberByEmail(email);
@ -129,7 +156,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
});
@ -173,7 +200,7 @@ describe('Members Signin', function () {
// Use a first time
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
// Fetch token in the database
@ -189,7 +216,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
await model.refresh();
@ -226,17 +253,17 @@ describe('Members Signin', function () {
// Use a first time
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
// Fetch token in the database
@ -534,7 +561,7 @@ describe('Members Signin', function () {
await membersAgent.get(`/?token=${token}&action=signup`)
.expectStatus(302)
.expectHeader('Location', /\/welcome-free\/$/)
.expectHeader('Location', /\/welcome-free\/\?success=true&action=signup$/)
.expectHeader('Set-Cookie', /members-ssr.*/);
const member = await getMemberByEmail(email);