make messages more explicit for exceptions

HackAssistant · Dec 19, 2018 · 94b1487 · 94b1487
1 parent 4bb1834
commit 94b1487
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/user/providers.py b/user/providers.py
@@ -14,7 +14,7 @@ def auth_mlh(auth_code, request):
     # Get Auth code from GET request
     conf['code'] = auth_code
     if not conf['code']:
-        raise ValueError('Missing code, please start again!')
+        raise ValueError('Invalid URL')
 
     # Get Bearer token
     conf['redirect_url'] = reverse('callback', request=request, kwargs={'provider': 'mlh'})

diff --git a/user/views.py b/user/views.py
@@ -198,11 +198,13 @@ def send_email_verification(request):
 
 def callback(request, provider=None):
     if not provider:
+        messages.error(request, 'Invalid URL')
         return HttpResponseRedirect(reverse('root'))
     if request.user.is_authenticated:
         return HttpResponseRedirect(reverse('root'))
     code = request.GET.get('code', '')
     if not code:
+        messages.error(request, 'Invalid URL')
         return HttpResponseRedirect(reverse('root'))
     try:
         access_token = providers.auth_mlh(code, request)
@@ -215,7 +217,7 @@ def callback(request, provider=None):
     if user:
         auth.login(request, user)
     elif User.objects.filter(email=mlhuser.get('email', None)).first():
-        messages.error(request, 'An account with this email already exists')
+        messages.error(request, 'An account with this email already exists. Sign in using your password.')
     else:
         user = User.objects.create_mlhuser(
             email=mlhuser.get('email', None),