Skip to content

Commit

Permalink
Fix an issue where changing MFA_SUPPORTED_METHODS breaks the MFA vali…
Browse files Browse the repository at this point in the history
…dation. pgadmin-org#6624
  • Loading branch information
adityatoshniwal authored and akshay-joshi committed Aug 4, 2023
1 parent 1ff94d9 commit 69085c4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion web/pgadmin/authenticate/mfa/templates/mfa/validate.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'actionUrl': url_for('mfa.validate'),
'views': views,
'logoutUrl': logout_url,
'sendEmailUrl': url_for("mfa.send_email_code"),
'sendEmailUrl': send_email_url,
'csrfHeader': current_app.config.get("WTF_CSRF_HEADERS")[0],
'csrfToken': csrf_token()
} %}
Expand Down
7 changes: 6 additions & 1 deletion web/pgadmin/authenticate/mfa/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,14 @@ def validate_view() -> Response:
if mfa_method is None and len(mfa_views) > 0:
list(mfa_views.items())[0][1]['selected'] = True

send_email_url = None
if 'email' in mfa_views:
send_email_url = url_for("mfa.send_email_code")

return Response(render_template(
"mfa/validate.html", _=_, views=mfa_views, base64=base64,
logout_url=get_logout_url()
logout_url=get_logout_url(),
send_email_url=send_email_url
), return_code, headers=_NO_CACHE_HEADERS, mimetype="text/html")


Expand Down

0 comments on commit 69085c4

Please sign in to comment.