aboutsummaryrefslogtreecommitdiffstats
path: root/src/account
diff options
context:
space:
mode:
authorSawyer Bergeron <sbergeron@iol.unh.edu>2020-06-18 12:10:27 -0400
committerSawyer Bergeron <sbergeron@iol.unh.edu>2020-06-18 12:10:27 -0400
commit0a8de17a33228a8fa9abd7b39149990650ce99d9 (patch)
tree78aebe2e23e5b92a1453f9f1ac30f3a609371005 /src/account
parentf96012fae9a106228ad80671a8c66476834a50db (diff)
Fix jira login
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> Change-Id: Ie179d2909f296291d8722f5e6c34a4cf748327de
Diffstat (limited to 'src/account')
-rw-r--r--src/account/tasks.py5
-rw-r--r--src/account/views.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/account/tasks.py b/src/account/tasks.py
index fe51974..53fbaf5 100644
--- a/src/account/tasks.py
+++ b/src/account/tasks.py
@@ -26,7 +26,10 @@ def sync_jira_accounts():
except JIRAError:
# User can be anonymous (local django admin account)
continue
- user.email = user_dict['emailAddress']
+ try:
+ user.email = user_dict['emailAddress']
+ except:
+ pass
user.userprofile.url = user_dict['self']
user.userprofile.full_name = user_dict['displayName']
diff --git a/src/account/views.py b/src/account/views.py
index d1cc813..1cb2275 100644
--- a/src/account/views.py
+++ b/src/account/views.py
@@ -127,7 +127,11 @@ class JiraAuthenticatedView(RedirectView):
jira = JIRA(server=settings.JIRA_URL, oauth=oauth_dict)
username = jira.current_user()
- email = jira.user(username).emailAddress
+ email = ""
+ try:
+ email = jira.user(username).emailAddress
+ except:
+ email = ""
url = '/'
# Step 3. Lookup the user or create them if they don't exist.
try: