github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14460 from overleaf/tm-prevent-checkout-unconfirmed-email

Browse source 
Restrict checkout page for users without confirmed primary email

GitOrigin-RevId: a02b0f64824f8adc8f15ae24b9132569bd1029f3
This commit is contained in:
John Lees-Miller 2023-08-23 09:37:33 +01:00 committed by Copybot
parent 1e4028d05e
commit 2ad98aa61c
3 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/web/app/src/Features/Subscription/SubscriptionController.js
View file

@ -23,6 +23,7 @@ const OError = require('@overleaf/o-error')
const SplitTestHandler = require('../SplitTests/SplitTestHandler')
const SubscriptionHelper = require('./SubscriptionHelper')
const Features = require('../../infrastructure/Features')
const UserGetter = require('../User/UserGetter')
const groupPlanModalOptions = Settings.groupPlanModalOptions
const validGroupPlanModalOptions = {
@ -193,6 +194,21 @@ async function paymentPage(req, res) {
currency = recommendedCurrency
}
// Prevent checkout for users without a confirmed primary email address
const userData = await UserGetter.promises.getUser(user._id, {
email: 1,
emails: 1,
})
const userPrimaryEmail = userData.emails.find(
emailEntry => emailEntry.email === userData.email
)
if (userPrimaryEmail?.confirmedAt == null) {
return res.render('subscriptions/unconfirmed-primary-email', {
title: 'confirm_email',
email: userData.email,
})
}
// Block web sales to restricted countries
if (['CU', 'IR', 'KP', 'RU', 'SY', 'VE'].includes(countryCode)) {
return res.render('subscriptions/restricted-country', {

11
services/web/app/views/subscriptions/unconfirmed-primary-email.pug Normal file
View file

@ -0,0 +1,11 @@
extends ../layout-marketing
block content
main.content.content-alt#main-content
.container
.error-container
.error-details
p.error-status #{translate("confirm_email")}
p.error-description !{translate("please_confirm_email", {emailAddress: email})}
p.error-actions
a.error-btn(href="/user/settings") #{translate("account_settings")}

23
services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
View file

@ -30,6 +30,7 @@ describe('SubscriptionController', function () {
email: 'tom@yahoo.com',
_id: 'one',
signUpDate: new Date('2000-10-01'),
emails: [{ email: 'tom@yahoo.com', confirmedAt: new Date('2000-10-02') }],
}
this.activeRecurlySubscription =
mockSubscriptions['subscription-123-active']
@ -386,6 +387,28 @@ describe('SubscriptionController', function () {
})
})
describe('with a user that has not confirmed their primary email address', function () {
beforeEach(function () {
this.LimitationsManager.promises.userHasV1OrV2Subscription.resolves(
false
)
this.PlansLocator.findLocalPlanInSettings.returns({})
this.UserGetter.promises.getUser.resolves({
email: 'test@example.com',
emails: [{ email: 'test@example.com' }],
})
})
it('should not render the checkout and instead show the unconfirmed primary email page', function (done) {
this.res.render = (page, opts) => {
page.should.equal('subscriptions/unconfirmed-primary-email')
opts.email.should.equal('test@example.com')
done()
}
this.SubscriptionController.paymentPage(this.req, this.res, done)
})
})
describe('with a user from a restricted country', function () {
beforeEach(function () {
this.LimitationsManager.promises.userHasV1OrV2Subscription.resolves(