[airavata-django-portal] branch develop updated (a0e4245 -> c6ad9a4)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.


    from a0e4245  Merge branch 'AIRAVATA-3301--Google-Analytics' into develop
     add 0177654  Keep passwords out of error emails
     new c6ad9a4  Merge branch 'master' into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 django_airavata/apps/auth/views.py | 4 ++++
 1 file changed, 4 insertions(+)

[airavata-django-portal] 01/01: Merge branch 'master' into develop

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit c6ad9a43b64c862ce7b360cec6a15b1683af19e2
Merge: a0e4245 0177654
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Mar 11 14:56:24 2020 -0400

    Merge branch 'master' into develop

 django_airavata/apps/auth/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc django_airavata/apps/auth/views.py
index 1147e42,79349fa..f0980f5
--- a/django_airavata/apps/auth/views.py
+++ b/django_airavata/apps/auth/views.py
@@@ -10,9 -10,11 +10,10 @@@ from django.core.exceptions import Obje
  from django.forms import ValidationError
  from django.http import HttpResponseBadRequest, JsonResponse
  from django.shortcuts import redirect, render, resolve_url
 -from django.template import Context, Template
 +from django.template import Context
  from django.urls import reverse
  from requests_oauthlib import OAuth2Session
+ from django.views.decorators.debug import sensitive_variables
  
  from . import forms, iam_admin_client, models, utils
  
@@@ -384,9 -374,10 +387,10 @@@ def _create_and_send_password_reset_req
          "portal_title": settings.PORTAL_TITLE,
          "url": verification_uri,
      })
 -    _send_email_to_user(models.PASSWORD_RESET_EMAIL_TEMPLATE, context)
 +    utils.send_email_to_user(models.PASSWORD_RESET_EMAIL_TEMPLATE, context)
  
  
+ @sensitive_variables('password')
  def reset_password(request, code):
      try:
          password_reset_request = models.PasswordResetRequest.objects.get(