From commits-return-19924-archive-asf-public=cust-asf.ponee.io@airavata.apache.org  Wed Oct 31 18:48:17 2018
Return-Path: <commits-return-19924-archive-asf-public=cust-asf.ponee.io@airavata.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id D716B1807A1
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 31 Oct 2018 18:48:16 +0100 (CET)
Received: (qmail 22876 invoked by uid 500); 31 Oct 2018 17:48:16 -0000
Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@airavata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@airavata.apache.org>
List-Post: <mailto:commits@airavata.apache.org>
List-Id: <commits.airavata.apache.org>
Reply-To: dev@airavata.apache.org
Delivered-To: mailing list commits@airavata.apache.org
Received: (qmail 22788 invoked by uid 99); 31 Oct 2018 17:48:15 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2018 17:48:15 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id A2152852D2; Wed, 31 Oct 2018 17:48:14 +0000 (UTC)
Date: Wed, 31 Oct 2018 17:48:21 +0000
To: "commits@airavata.apache.org" <commits@airavata.apache.org>
Subject: [airavata-django-portal] 07/09: AIRAVATA-2888 Success/error messages
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: machristie@apache.org
In-Reply-To: <154100809400.24693.8914575068919484712@gitbox.apache.org>
References: <154100809400.24693.8914575068919484712@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: airavata-django-portal
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 810533914396eab695720fbf7c6520743cc47092
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20181031174814.A2152852D2@gitbox.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 810533914396eab695720fbf7c6520743cc47092
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Mon Oct 29 09:54:12 2018 -0400

    AIRAVATA-2888 Success/error messages
---
 .../django_airavata_auth/create_account.html       |  7 +++
 .../auth/templates/django_airavata_auth/login.html |  9 +++-
 .../django_airavata_auth/verify_email.html         |  7 +++
 django_airavata/apps/auth/views.py                 | 56 ++++++++++++++++++----
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/django_airavata/apps/auth/templates/django_airavata_auth/create_account.html b/django_airavata/apps/auth/templates/django_airavata_auth/create_account.html
index 29ff91b..5a943a9 100644
--- a/django_airavata/apps/auth/templates/django_airavata_auth/create_account.html
+++ b/django_airavata/apps/auth/templates/django_airavata_auth/create_account.html
@@ -31,6 +31,13 @@
           {% else %}
           <h5 class="card-title">Create a {{ options.password.name }} account</h5>
           {% endif %}
+          {% if messages %}
+            {% for message in messages %}
+            <div class="alert {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}alert-danger{% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}alert-success{% else %}alert-secondary{% endif %}" role="alert">
+              {{ message }}
+            </div>
+            {% endfor %}
+          {% endif %}
           <form action="{% url 'django_airavata_auth:create_account' %}" method="post">
             {% for error in form.non_field_errors %}
             <div class="alert alert-danger" role="alert">
diff --git a/django_airavata/apps/auth/templates/django_airavata_auth/login.html b/django_airavata/apps/auth/templates/django_airavata_auth/login.html
index 80abbee..299f7fc 100644
--- a/django_airavata/apps/auth/templates/django_airavata_auth/login.html
+++ b/django_airavata/apps/auth/templates/django_airavata_auth/login.html
@@ -25,13 +25,20 @@
         </div>
     </div>
     {% endif %}
-    
+
     {% if options.password %}
     <div class="row">
         <div class="col">
             <div class="card">
                 <div class="card-body">
                     <h5 class="card-title">Log in with {{ options.password.name|default:"a username and password" }}</h5>
+                    {% if messages %}
+                      {% for message in messages %}
+                      <div class="alert {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}alert-danger{% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}alert-success{% else %}alert-secondary{% endif %}" role="alert">
+                        {{ message }}
+                      </div>
+                      {% endfor %}
+                    {% endif %}
                     <form action="{% url 'django_airavata_auth:handle_login' %}" method="post">
                         {% csrf_token %}
                         <div class="form-group">
diff --git a/django_airavata/apps/auth/templates/django_airavata_auth/verify_email.html b/django_airavata/apps/auth/templates/django_airavata_auth/verify_email.html
index d737105..4a1130e 100644
--- a/django_airavata/apps/auth/templates/django_airavata_auth/verify_email.html
+++ b/django_airavata/apps/auth/templates/django_airavata_auth/verify_email.html
@@ -8,6 +8,13 @@
       <div class="card">
         <div class="card-body">
           <h5 class="card-title">Resend Email Verification Link</h5>
+          {% if messages %}
+            {% for message in messages %}
+            <div class="alert {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}alert-danger{% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}alert-success{% else %}alert-secondary{% endif %}" role="alert">
+              {{ message }}
+            </div>
+            {% endfor %}
+          {% endif %}
           <form action="{% url 'django_airavata_auth:resend_email_link' %}" method="post">
             {% for error in form.non_field_errors %}
             <div class="alert alert-danger" role="alert">
diff --git a/django_airavata/apps/auth/views.py b/django_airavata/apps/auth/views.py
index 271881b..1ec89c2 100644
--- a/django_airavata/apps/auth/views.py
+++ b/django_airavata/apps/auth/views.py
@@ -3,6 +3,7 @@ from urllib.parse import quote
 
 from django.conf import settings
 from django.contrib.auth import authenticate, login, logout
+from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import mail_admins, send_mail
 from django.forms import ValidationError
@@ -59,9 +60,11 @@ def handle_login(request):
             next_url = request.POST.get('next', settings.LOGIN_REDIRECT_URL)
             return redirect(next_url)
         else:
-            # TODO: add error message that login failed
+            messages.error(request, "Login failed. Please try again.")
             return render(request, 'django_airavata_auth/login.html', {
-                'username': username
+                'username': username,
+                'next': request.POST.get('next', None),
+                'options': settings.AUTHENTICATION_OPTIONS,
             })
     except Exception as err:
         logger.exception("An error occurred while logging in with "
@@ -113,7 +116,12 @@ def create_account(request):
                 else:
                     _create_and_send_email_verification_link(
                         request, username, email, first_name, last_name)
-                    # TODO: success message
+                    messages.success(
+                        request,
+                        "Account request processed successfully. Before you "
+                        "can login you need to confirm your email address. "
+                        "We've sent you an email with a link that you should "
+                        "click on to complete the account creation process.")
                     return redirect(
                         reverse('django_airavata_auth:create_account'))
             except Exception as e:
@@ -135,13 +143,15 @@ def verify_email(request, code):
             verification_code=code)
         email_verification.verified = True
         email_verification.save()
-        # TODO: test what happens if calling iam_admin_client fails
         # Check if user is enabled, if so redirect to login page
         username = email_verification.username
         logger.debug("Email address verified for {}".format(username))
         if iam_admin_client.is_user_enabled(username):
             logger.debug("User {} is already enabled".format(username))
-            # TODO: add success message
+            messages.success(
+                request,
+                "Your account has already been successfully created. "
+                "Please log in now.")
             return redirect(reverse('django_airavata_auth:login'))
         else:
             logger.debug("Enabling user {}".format(username))
@@ -152,17 +162,32 @@ def verify_email(request, code):
                 'New User Created',
                 'New user: {}'.format(username)
             )
-            # TODO: add success message
+            messages.success(
+                request,
+                "Your account has been successfully created. "
+                "Please log in now.")
             return redirect(reverse('django_airavata_auth:login'))
     except ObjectDoesNotExist as e:
-        # TODO: if doesn't exist, give user a form where they can enter their
+        # if doesn't exist, give user a form where they can enter their
         # username to resend verification code
+        logger.exception("EmailVerification object doesn't exist for "
+                         "code {}".format(code))
+        messages.error(
+            request,
+            "Email verification failed. Please enter your username and we "
+            "will send you another email verification link.")
         return redirect(reverse('django_airavata_auth:resend_email_link'))
+    except Exception as e:
+        logger.exception("Email verification processing failed!")
+        messages.error(
+            request,
+            "Email verification failed. Please try clicking the email "
+            "verification link again later.")
+        return redirect(reverse('django_airavata_auth:create_account'))
 
 
 def resend_email_link(request):
 
-    # TODO: if the user is already verified their email, then redirect to login page with message
     if request.method == 'POST':
         form = forms.ResendEmailVerificationLinkForm(request.POST)
         if form.is_valid():
@@ -170,13 +195,24 @@ def resend_email_link(request):
                 username = form.cleaned_data['username']
                 if iam_admin_client.is_user_exist(username):
                     user_profile = iam_admin_client.get_user(username)
+                    email_address = user_profile.emails[0]
                     _create_and_send_email_verification_link(
                         request,
                         username,
-                        user_profile.emails[0],
+                        email_address,
                         user_profile.firstName,
                         user_profile.lastName)
-                # TODO: success message
+                    messages.success(
+                        request,
+                        "Email verification link sent successfully. Please "
+                        "click on the link in the email that we sent "
+                        "to your email address.")
+                else:
+                    messages.error(
+                        request,
+                        "Unable to resend email verification link. Please "
+                        "contact the website administrator for further "
+                        "assistance.")
                 return redirect(
                     reverse('django_airavata_auth:resend_email_link'))
             except Exception as e: