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

Bug fixes.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-27 17:26:22 +00:00
parent ff8a727759
commit c123098e14
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/dao/users_dao.py
View File

@@ -27,8 +27,8 @@ def get_user_by_email(email_address):
return user_api_client.get_user_by_email(email_address) return user_api_client.get_user_by_email(email_address)
def verify_password(user, password): def verify_password(user_id, password):
return user_api_client.verify_password(user, password) return user_api_client.verify_password(user_id, password)
def update_user(user): def update_user(user):

13
app/main/views/user_profile.py
View File

@@ -4,7 +4,8 @@ from flask.ext.login import current_user
from flask_login import login_required from flask_login import login_required
from app.main import main from app.main import main
from app.main.dao.users_dao import ( from app.main.dao.users_dao import (
verify_password, update_user, check_verify_code, is_email_unique) verify_password, update_user, check_verify_code, is_email_unique,
send_verify_code)
from app.main.forms import ( from app.main.forms import (
ChangePasswordForm, ChangeNameForm, ChangeEmailForm, ConfirmEmailForm, ChangePasswordForm, ChangeNameForm, ChangeEmailForm, ConfirmEmailForm,
ChangeMobileNumberForm, ConfirmMobileNumberForm, ConfirmPasswordForm ChangeMobileNumberForm, ConfirmMobileNumberForm, ConfirmPasswordForm
@@ -65,7 +66,7 @@ def user_profile_email_authenticate():
# Validate password for form # Validate password for form
def _check_password(pwd): def _check_password(pwd):
return verify_password(current_user, pwd) return verify_password(current_user.id, pwd)
form = ConfirmPasswordForm(_check_password) form = ConfirmPasswordForm(_check_password)
if NEW_EMAIL not in session: if NEW_EMAIL not in session:
@@ -73,6 +74,7 @@ def user_profile_email_authenticate():
if form.validate_on_submit(): if form.validate_on_submit():
session[NEW_EMAIL_PASSWORD_CONFIRMED] = True session[NEW_EMAIL_PASSWORD_CONFIRMED] = True
users_dao.send_verify_code(current_user.id, 'email', to=session[NEW_EMAIL])
return redirect(url_for('.user_profile_email_confirm')) return redirect(url_for('.user_profile_email_confirm'))
return render_template( return render_template(
@@ -132,7 +134,7 @@ def user_profile_mobile_number_authenticate():
# Validate password for form # Validate password for form
def _check_password(pwd): def _check_password(pwd):
return verify_password(current_user, pwd) return verify_password(current_user.id, pwd)
form = ConfirmPasswordForm(_check_password) form = ConfirmPasswordForm(_check_password)
if NEW_MOBILE not in session: if NEW_MOBILE not in session:
@@ -140,6 +142,7 @@ def user_profile_mobile_number_authenticate():
if form.validate_on_submit(): if form.validate_on_submit():
session[NEW_MOBILE_PASSWORD_CONFIRMED] = True session[NEW_MOBILE_PASSWORD_CONFIRMED] = True
send_verify_code(current_user.id, 'sms', to=session[NEW_MOBILE])
return redirect(url_for('.user_profile_mobile_number_confirm')) return redirect(url_for('.user_profile_mobile_number_confirm'))
return render_template( return render_template(
@@ -156,7 +159,7 @@ def user_profile_mobile_number_confirm():
# Validate verify code for form # Validate verify code for form
def _check_code(cde): def _check_code(cde):
return check_verify_code(current_user, cde, 'sms') return check_verify_code(current_user.id, cde, 'sms')
if NEW_MOBILE_PASSWORD_CONFIRMED not in session: if NEW_MOBILE_PASSWORD_CONFIRMED not in session:
return redirect(url_for('.user_profile_mobile_number')) return redirect(url_for('.user_profile_mobile_number'))
@@ -164,7 +167,7 @@ def user_profile_mobile_number_confirm():
form = ConfirmMobileNumberForm(_check_code) form = ConfirmMobileNumberForm(_check_code)
if form.validate_on_submit(): if form.validate_on_submit():
current_user.mobile = session[NEW_MOBILE] current_user.mobile_number = session[NEW_MOBILE]
del session[NEW_MOBILE] del session[NEW_MOBILE]
del session[NEW_MOBILE_PASSWORD_CONFIRMED] del session[NEW_MOBILE_PASSWORD_CONFIRMED]
update_user(current_user) update_user(current_user)

7
app/notify_client/user_api_client.py
View File

@@ -45,11 +45,10 @@ class UserApiClient(BaseAPIClient):
user_data = self.put(url, data=data) user_data = self.put(url, data=data)
return User(user_data['data'], max_failed_login_count=self.max_failed_login_count) return User(user_data['data'], max_failed_login_count=self.max_failed_login_count)
def verify_password(self, user, password): def verify_password(self, user_id, password):
try: try:
data = user.serialize() url = "/user/{}/verify/password".format(user_id)
url = "/user/{}/verify/password".format(user.id) data = {"password": password}
data["password"] = password
self.post(url, data=data) self.post(url, data=data)
return True return True
except HTTPError as e: except HTTPError as e: