1 files changed, 31 insertions, 10 deletions

diff --git a/pharos-dashboard/src/account/views.py b/pharos-dashboard/src/account/views.py
index 3b4269d..17fbdc3 100644
--- a/pharos-dashboard/src/account/views.py
+++ b/pharos-dashboard/src/account/views.py
@@ -12,6 +12,7 @@ import os
 import urllib
 
 import oauth2 as oauth
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import logout, authenticate, login
 from django.contrib.auth.decorators import login_required
@@ -19,17 +20,13 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.urls import reverse
 from django.utils.decorators import method_decorator
-from django.views.generic import RedirectView
-from django.views.generic import TemplateView
-from django.views.generic import UpdateView
+from django.views.generic import RedirectView, TemplateView, UpdateView
 from jira import JIRA
+from rest_framework.authtoken.models import Token
 
 from account.forms import AccountSettingsForm
 from account.jira_util import SignatureMethod_RSA_SHA1
 from account.models import UserProfile
-from django.conf import settings
-
-consumer = oauth.Consumer(settings.OAUTH_CONSUMER_KEY, settings.OAUTH_CONSUMER_SECRET)
 
 
 @method_decorator(login_required, name='dispatch')
@@ -46,22 +43,36 @@ class AccountSettingsView(UpdateView):
     def get_object(self, queryset=None):
         return self.request.user.userprofile
 
+    def get_context_data(self, **kwargs):
+        token, created = Token.objects.get_or_create(user=self.request.user)
+        context = super(AccountSettingsView, self).get_context_data(**kwargs)
+        context.update({'title': "Settings", 'token': token})
+        return context
+
 
 class JiraLoginView(RedirectView):
     def get_redirect_url(self, *args, **kwargs):
+        consumer = oauth.Consumer(settings.OAUTH_CONSUMER_KEY, settings.OAUTH_CONSUMER_SECRET)
         client = oauth.Client(consumer)
         client.set_signature_method(SignatureMethod_RSA_SHA1())
 
         # Step 1. Get a request token from Jira.
-        resp, content = client.request(settings.OAUTH_REQUEST_TOKEN_URL, "POST")
+        try:
+            resp, content = client.request(settings.OAUTH_REQUEST_TOKEN_URL, "POST")
+        except Exception as e:
+            messages.add_message(self.request, messages.ERROR,
+                                 'Error: Connection to Jira failed. Please contact an Administrator')
+            return '/'
         if resp['status'] != '200':
-            raise Exception("Invalid response %s: %s" % (resp['status'], content))
+            messages.add_message(self.request, messages.ERROR,
+                                 'Error: Connection to Jira failed. Please contact an Administrator')
+            return '/'
 
         # Step 2. Store the request token in a session for later use.
         self.request.session['request_token'] = dict(urllib.parse.parse_qsl(content.decode()))
         # Step 3. Redirect the user to the authentication URL.
         url = settings.OAUTH_AUTHORIZE_URL + '?oauth_token=' + \
-                self.request.session['request_token']['oauth_token'] + \
+              self.request.session['request_token']['oauth_token'] + \
               '&oauth_callback=' + settings.OAUTH_CALLBACK_URL
         return url
 
@@ -75,14 +86,22 @@ class JiraLogoutView(LoginRequiredMixin, RedirectView):
 class JiraAuthenticatedView(RedirectView):
     def get_redirect_url(self, *args, **kwargs):
         # Step 1. Use the request token in the session to build a new client.
+        consumer = oauth.Consumer(settings.OAUTH_CONSUMER_KEY, settings.OAUTH_CONSUMER_SECRET)
         token = oauth.Token(self.request.session['request_token']['oauth_token'],
                             self.request.session['request_token']['oauth_token_secret'])
         client = oauth.Client(consumer, token)
         client.set_signature_method(SignatureMethod_RSA_SHA1())
 
         # Step 2. Request the authorized access token from Jira.
-        resp, content = client.request(settings.OAUTH_ACCESS_TOKEN_URL, "POST")
+        try:
+            resp, content = client.request(settings.OAUTH_ACCESS_TOKEN_URL, "POST")
+        except Exception as e:
+            messages.add_message(self.request, messages.ERROR,
+                                 'Error: Connection to Jira failed. Please contact an Administrator')
+            return '/'
         if resp['status'] != '200':
+            messages.add_message(self.request, messages.ERROR,
+                                 'Error: Connection to Jira failed. Please contact an Administrator')
             return '/'
 
         access_token = dict(urllib.parse.parse_qsl(content.decode()))
@@ -122,6 +141,8 @@ class JiraAuthenticatedView(RedirectView):
         # redirect user to settings page to complete profile
         return url
 
+
+@method_decorator(login_required, name='dispatch')
 class UserListView(TemplateView):
     template_name = "account/user_list.html"