darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

If a user has already registered with the email they will get a different email when the register again.

Browse Source 
The email includes likes to sign in and send feedback
This commit is contained in:
Rebecca Law
2016-07-12 11:53:30 +01:00
parent b4525d0a64
commit 43938936f3
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/main/views/register.py
View File

@@ -34,12 +34,8 @@ def register():
form = RegisterUserForm()
if form.validate_on_submit():
registered = _do_registration(form, send_sms=False)
if registered:
return redirect(url_for('main.registration_continue'))
else:
flash('There was an error registering your account')
return render_template('views/register.html', form=form), 400
_do_registration(form, send_sms=False)
return redirect(url_for('main.registration_continue'))
return render_template('views/register.html', form=form)
@@ -54,12 +50,9 @@ def register_from_invite():
if form.validate_on_submit():
if form.service.data != invited_user['service'] or form.email_address.data != invited_user['email_address']:
abort(400)
registered = _do_registration(form, send_email=False)
if registered:
invite_api_client.accept_invite(invited_user['service'], invited_user['id'])
return redirect(url_for('main.verify'))
else:
flash('There was an error registering your account')
_do_registration(form, send_email=False)
invite_api_client.accept_invite(invited_user['service'], invited_user['id'])
return redirect(url_for('main.verify'))
form.service.data = invited_user['service']
form.email_address.data = invited_user['email_address']
@@ -87,9 +80,12 @@ def _do_registration(form, service=None, send_sms=True, send_email=True):
user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
session['expiry_date'] = str(datetime.utcnow() + timedelta(hours=1))
session['user_details'] = {"email": user.email_address, "id": user.id}
return True
else:
return False
if send_email:
user = user_api_client.get_user_by_email(form.email_address.data)
user_api_client.send_already_registered_email(user.id, user.email_address)
session['expiry_date'] = str(datetime.utcnow() + timedelta(hours=1))
session['user_details'] = {"email": user.email_address, "id": user.id}
@main.route('/registration-continue')

2
app/notify_client/user_api_client.py
View File

@@ -75,7 +75,7 @@ class UserApiClient(BaseAPIClient):
endpoint = '/user/{0}/email-verification'.format(user_id)
self.post(endpoint, data=data)
def sent_already_registered_email(self, user_id, to):
def send_already_registered_email(self, user_id, to):
data = {'email': to}
endpoint = '/user/{0}/email-already-registered'.format(user_id)
self.post(endpoint, data=data)