[airavata-django-portal] 01/04: Merge branch 'airavata-3243'

[ma...@apache.org]

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

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

commit d5c32154d0602b1db179a36f6fb26eaa59d5baae
Merge: edecf49 5535b32
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Apr 22 12:12:42 2020 -0400

    Merge branch 'airavata-3243'

 .travis.yml                                        |   1 +
 .../src/components/users/UserDetailsContainer.vue  |  50 ++-
 django_airavata/apps/api/signals.py                |   9 +-
 django_airavata/apps/api/tests.py                  | 471 ++++++++++++++++++++-
 django_airavata/apps/api/views.py                  |  29 ++
 django_airavata/apps/auth/apps.py                  |   3 +
 .../auth/migrations/0005_auto_20191211_2011.py     |  66 +++
 django_airavata/apps/auth/models.py                |   2 +
 django_airavata/apps/auth/signals.py               |  25 ++
 django_airavata/apps/auth/tests.py                 |  82 +++-
 django_airavata/apps/auth/utils.py                 |  18 +
 django_airavata/apps/auth/views.py                 |  24 +-
 django_airavata/settings.py                        |   1 +
 13 files changed, 747 insertions(+), 34 deletions(-)

diff --cc django_airavata/apps/auth/views.py
index 785c7d6,4e8decd..5da2a2e
--- a/django_airavata/apps/auth/views.py
+++ b/django_airavata/apps/auth/views.py
@@@ -10,10 -10,8 +10,9 @@@ 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 django.views.decorators.debug import sensitive_variables
  from requests_oauthlib import OAuth2Session
  
  from . import forms, iam_admin_client, models, utils
@@@ -374,10 -370,9 +373,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(