From 8e58c58886d32a2fbe2099b629f8235ea0ac8fea Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Tue, 3 Dec 2024 16:40:05 -0500 Subject: [PATCH 1/8] Added email checks --- client/app/controllers/subscribe.js | 71 +++++++++++++++++++++ client/app/styles/app.scss | 1 + client/app/styles/modules/_m-subscribe.scss | 13 ++++ client/app/templates/subscribe.hbs | 11 +++- 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 client/app/controllers/subscribe.js create mode 100644 client/app/styles/modules/_m-subscribe.scss diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js new file mode 100644 index 00000000..a964f8e5 --- /dev/null +++ b/client/app/controllers/subscribe.js @@ -0,0 +1,71 @@ +import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import fetch from 'fetch'; +import ENV from 'labs-zap-search/config/environment'; + +const tlds = [".com", ".gov", ".edu", ".net", ".org"]; + +export default class SubscribeController extends Controller { + lastEmailChecked = ""; + emailAlreadyExists = false; + emailNeedsConfirmation = false; + startContinuouslyChecking = false; + emailSent = false; + + + @action + async checkExistingEmail(event) { + const email = event.target.value; + if(email === this.lastEmailChecked) { return; } + this.set('lastEmailChecked', email); + this.set('startContinuouslyChecking', true); + + try { + const response = await fetch(`${ENV.host}/subscribers/email/${email}`); + const userData = await response.json(); + + if (userData.error) { + this.set('emailAlreadyExists', false); + this.set('emailNeedsConfirmation', false); + this.set('emailSent', false); + return; + } + + if (userData.message === "User already subscribed.") { + this.set('emailAlreadyExists', true); + this.set('emailNeedsConfirmation', false); + } else if (userData.message === "User is subscribed but must confirm.") { + this.set('emailNeedsConfirmation', true); + this.set('emailAlreadyExists', false); + } + return; + } catch (error) { + // We will receive an error if: + // a) the user does not exist in Sendgrid, or + // b) their confirmed field is null. + // Either way, we don't need to log to console + this.set('emailAlreadyExists', false); + this.set('emailNeedsConfirmation', false); + this.set('emailSent', false); + } + } + + @action + continuouslyCheckEmail(event) { + if((this.startContinuouslyChecking) || (tlds.includes(event.target.value.slice(-4)))) { this.checkExistingEmail(event) } + } + + @action + sendEmail() { + if (this.emailAlreadyExists) { + // Run the script to update the email + // Endpoint does not yet exist + this.set('emailSent', true); + } else if (this.emailNeedsConfirmation) { + // Run the script to confirm the email + // Endpoint does not yet exist + this.set('emailSent', true); + } + } + +} diff --git a/client/app/styles/app.scss b/client/app/styles/app.scss index 0ab8f05f..5b15b623 100644 --- a/client/app/styles/app.scss +++ b/client/app/styles/app.scss @@ -69,6 +69,7 @@ $completed-color: #a6cee3; @import 'modules/_m-search'; @import 'modules/_m-site-header'; @import 'modules/_m-statuses'; +@import 'modules/_m-subscribe'; @import 'modules/_m-subscribed'; @import 'modules/_m-subscribers-confirm'; @import 'modules/_m-subscription-form'; diff --git a/client/app/styles/modules/_m-subscribe.scss b/client/app/styles/modules/_m-subscribe.scss new file mode 100644 index 00000000..ca67ac83 --- /dev/null +++ b/client/app/styles/modules/_m-subscribe.scss @@ -0,0 +1,13 @@ +// -------------------------------------------------- +// Module: Subscribe Page +// -------------------------------------------------- + +.email-exists, .email-needs-confirmation { + padding-top: 1.5rem; + font-weight: 700; +} + +.email-sent { + color: $success-color; + font-weight: 700; +} \ No newline at end of file diff --git a/client/app/templates/subscribe.hbs b/client/app/templates/subscribe.hbs index e54240fe..2cb66a9c 100644 --- a/client/app/templates/subscribe.hbs +++ b/client/app/templates/subscribe.hbs @@ -11,8 +11,17 @@
+ {{#if this.emailAlreadyExists}} + + {{/if}} + {{#if this.emailNeedsConfirmation}} + + {{/if}} + {{#if this.emailSent}} + + {{/if}}
From ffbc6cff4e96072baa0d3a862d85c3aa7a516b88 Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Tue, 10 Dec 2024 16:30:56 -0500 Subject: [PATCH 2/8] Added send modify email. --- client/app/controllers/subscribe.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js index a964f8e5..f1e873f3 100644 --- a/client/app/controllers/subscribe.js +++ b/client/app/controllers/subscribe.js @@ -56,11 +56,20 @@ export default class SubscribeController extends Controller { } @action - sendEmail() { + async sendEmail() { if (this.emailAlreadyExists) { // Run the script to update the email - // Endpoint does not yet exist - this.set('emailSent', true); + try { + const response = await fetch(`${ENV.host}/subscribers/${this.model.email}/modify`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + }); + this.set('emailSent', true); + } catch (error) { + console.error(error); + } } else if (this.emailNeedsConfirmation) { // Run the script to confirm the email // Endpoint does not yet exist From 7385bc0c55291dd3218eb2dc5aa2c2597bb14385 Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Tue, 10 Dec 2024 17:53:41 -0500 Subject: [PATCH 3/8] Added resend confirmation link --- client/app/controllers/subscribe.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js index f1e873f3..ad133668 100644 --- a/client/app/controllers/subscribe.js +++ b/client/app/controllers/subscribe.js @@ -72,8 +72,17 @@ export default class SubscribeController extends Controller { } } else if (this.emailNeedsConfirmation) { // Run the script to confirm the email - // Endpoint does not yet exist - this.set('emailSent', true); + try { + const response = await fetch(`${ENV.host}/subscribers/${this.model.email}/resend-confirmation`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + }); + this.set('emailSent', true); + } catch (error) { + console.error(error); + } } } From 077372f316fa1836d53943b6cf6c8c5a395a97d5 Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Wed, 11 Dec 2024 13:22:48 -0500 Subject: [PATCH 4/8] Linting fixes --- client/app/controllers/subscribe.js | 29 ++++++++++++++++------------- client/ember-cli-build.js | 4 ++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js index ad133668..7d906dfc 100644 --- a/client/app/controllers/subscribe.js +++ b/client/app/controllers/subscribe.js @@ -3,27 +3,31 @@ import { action } from '@ember/object'; import fetch from 'fetch'; import ENV from 'labs-zap-search/config/environment'; -const tlds = [".com", ".gov", ".edu", ".net", ".org"]; +const tlds = ['.com', '.gov', '.edu', '.net', '.org']; export default class SubscribeController extends Controller { - lastEmailChecked = ""; + lastEmailChecked = ''; + emailAlreadyExists = false; + emailNeedsConfirmation = false; + startContinuouslyChecking = false; + emailSent = false; @action async checkExistingEmail(event) { const email = event.target.value; - if(email === this.lastEmailChecked) { return; } + if (email === this.lastEmailChecked) { return; } this.set('lastEmailChecked', email); this.set('startContinuouslyChecking', true); try { const response = await fetch(`${ENV.host}/subscribers/email/${email}`); const userData = await response.json(); - + if (userData.error) { this.set('emailAlreadyExists', false); this.set('emailNeedsConfirmation', false); @@ -31,17 +35,17 @@ export default class SubscribeController extends Controller { return; } - if (userData.message === "User already subscribed.") { + if (userData.message === 'User already subscribed.') { this.set('emailAlreadyExists', true); this.set('emailNeedsConfirmation', false); - } else if (userData.message === "User is subscribed but must confirm.") { + } else if (userData.message === 'User is subscribed but must confirm.') { this.set('emailNeedsConfirmation', true); this.set('emailAlreadyExists', false); } return; } catch (error) { // We will receive an error if: - // a) the user does not exist in Sendgrid, or + // a) the user does not exist in Sendgrid, or // b) their confirmed field is null. // Either way, we don't need to log to console this.set('emailAlreadyExists', false); @@ -52,7 +56,7 @@ export default class SubscribeController extends Controller { @action continuouslyCheckEmail(event) { - if((this.startContinuouslyChecking) || (tlds.includes(event.target.value.slice(-4)))) { this.checkExistingEmail(event) } + if ((this.startContinuouslyChecking) || (tlds.includes(event.target.value.slice(-4)))) { this.checkExistingEmail(event); } } @action @@ -60,7 +64,7 @@ export default class SubscribeController extends Controller { if (this.emailAlreadyExists) { // Run the script to update the email try { - const response = await fetch(`${ENV.host}/subscribers/${this.model.email}/modify`, { + await fetch(`${ENV.host}/subscribers/${this.model.email}/modify`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -68,12 +72,12 @@ export default class SubscribeController extends Controller { }); this.set('emailSent', true); } catch (error) { - console.error(error); + console.error(error); // eslint-disable-line } } else if (this.emailNeedsConfirmation) { // Run the script to confirm the email try { - const response = await fetch(`${ENV.host}/subscribers/${this.model.email}/resend-confirmation`, { + await fetch(`${ENV.host}/subscribers/${this.model.email}/resend-confirmation`, { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -81,9 +85,8 @@ export default class SubscribeController extends Controller { }); this.set('emailSent', true); } catch (error) { - console.error(error); + console.error(error); // eslint-disable-line } } } - } diff --git a/client/ember-cli-build.js b/client/ember-cli-build.js index 48b76501..097678a5 100644 --- a/client/ember-cli-build.js +++ b/client/ember-cli-build.js @@ -49,9 +49,9 @@ module.exports = function(defaults) { // Use `app.import` to add additional libraries to the generated // output files. if (app.env === 'test') { - app.import('node_modules/foundation-sites/dist/js/foundation.js', {type: "test"}); + app.import('node_modules/foundation-sites/dist/js/foundation.js', { type: 'test' }); } else { - app.import('node_modules/foundation-sites/dist/js/foundation.min.js', {type: "vendor"}); + app.import('node_modules/foundation-sites/dist/js/foundation.min.js', { type: 'vendor' }); } // If you need to use different assets in different // environments, specify an object as the first parameter. That From 1bf23adbfbc1a686765cf167bd09d3b05cf2b8c2 Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Wed, 11 Dec 2024 16:36:18 -0500 Subject: [PATCH 5/8] Update to use boolean --- client/app/controllers/subscribe.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js index 7d906dfc..c4757a94 100644 --- a/client/app/controllers/subscribe.js +++ b/client/app/controllers/subscribe.js @@ -35,10 +35,10 @@ export default class SubscribeController extends Controller { return; } - if (userData.message === 'User already subscribed.') { + if (userData.confirmed === true) { this.set('emailAlreadyExists', true); this.set('emailNeedsConfirmation', false); - } else if (userData.message === 'User is subscribed but must confirm.') { + } else if (userData.confirmed === false) { this.set('emailNeedsConfirmation', true); this.set('emailAlreadyExists', false); } From e6aec94d2fa4530f4b480a9cce37a3755e99800f Mon Sep 17 00:00:00 2001 From: David Hochbaum Date: Wed, 11 Dec 2024 16:49:50 -0500 Subject: [PATCH 6/8] Disable Subscribe button for existing emails --- client/app/components/subscription-form.js | 5 ++++- client/app/controllers/subscribe.js | 6 +++++- client/app/templates/subscribe.hbs | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/app/components/subscription-form.js b/client/app/components/subscription-form.js index 3737dd8b..fa76c937 100644 --- a/client/app/components/subscription-form.js +++ b/client/app/components/subscription-form.js @@ -43,7 +43,7 @@ export default class SubscriptionFormComponent extends Component { } // eslint-disable-next-line ember/use-brace-expansion - @computed('isCommunityDistrict', 'args.subscriptions', 'args.email') + @computed('isCommunityDistrict', 'args.subscriptions', 'args.email', 'args.invalidEmailForSignup') get canBeSubmitted() { // If it's an update, subscriptions must be different, or they must have unchecked CD Updates if (this.args.isUpdate) { @@ -51,6 +51,9 @@ export default class SubscriptionFormComponent extends Component { if (!(Object.entries(this.args.subscriptions).find(([key, value]) => (this.previousSubscriptions[key] !== value)))) return false; } + // Disable signup with existing email addresses + if (this.args.invalidEmailForSignup) return false; + if ((this.isCommunityDistrict && !this.isAtLeastOneCommunityDistrictSelected)) return false; return this.isEmailValid && (this.args.subscriptions.CW diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js index c4757a94..74aa27a3 100644 --- a/client/app/controllers/subscribe.js +++ b/client/app/controllers/subscribe.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { action } from '@ember/object'; +import { action, computed } from '@ember/object'; import fetch from 'fetch'; import ENV from 'labs-zap-search/config/environment'; @@ -16,6 +16,10 @@ export default class SubscribeController extends Controller { emailSent = false; + @computed('emailAlreadyExists', 'emailNeedsConfirmation') + get invalidEmailForSignup() { + return (this.emailAlreadyExists || this.emailNeedsConfirmation); + } @action async checkExistingEmail(event) { diff --git a/client/app/templates/subscribe.hbs b/client/app/templates/subscribe.hbs index 2cb66a9c..c4bec57a 100644 --- a/client/app/templates/subscribe.hbs +++ b/client/app/templates/subscribe.hbs @@ -7,7 +7,7 @@ Get updated on milestones for all projects in any community district (CD) by signing up to receive emails on Zoning Application Portal.
- +