Skip to content

Commit

Permalink
login_success now returns appropriate messages
Browse files Browse the repository at this point in the history
  • Loading branch information
antiproblemist committed Apr 2, 2018
1 parent 632b8d0 commit 82b6a5d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ ENV/
.mypy_cache/

# Sqlite Database
.sqlite3
*.sqlite3
9 changes: 4 additions & 5 deletions accountkitlogin/templates/success.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@
<img class="mb-4" src="https://static.xx.fbcdn.net/rsrc.php/v3/ym/r/17s3EuGHeRn.png" alt="" width="72" height="72">
<h1 class="h3 mb-3 font-weight-normal">Response parameters</h1>
<ul class="text-left">
<li> User ID: {{ user_id }}</li>
<li> Phone Number: {{ phone_number }}</li>
<li> Email Address: {{ email_address }}</li>
<li> Access Token: <code>{{ user_access_token }}</code></li>
<li> Refresh Interval: {{ refresh_interval }}</li>
<li> User ID: {{ user.id }}</li>
<li> Username: {{ user.username }}</li>
<li> Message {{ message }}</li>
<li> Authenticated <code>{{ authenticated }}</code></li>
</ul>
<div class="row">
<a href="/logout" class="btn btn-lg btn-outline-danger btn-block">Logout</a>
Expand Down
39 changes: 19 additions & 20 deletions accountkitlogin/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,20 @@
accountkit_secret = getattr(settings, 'ACCOUNT_KIT_APP_SECRET')
accountkit_app_id = getattr(settings, 'APP_ID')

@csrf_exempt
def login_status(request):

code = request.GET.get('code') if request.GET.get('code', None) else request.POST.get('code', None)
state = request.GET.get('state') if request.GET.get('state', None) else request.POST.get('state', None)
status = request.GET.get('status') if request.GET.get('status', None) else request.POST.get('status', None)
context = {}

if status != "PARTIALLY_AUTHENTICATED ":
if request.user.is_authenticated:
context['authenticated'] = True
context['message'] = "User with username %s is already logged in" % request.user.username
context['user'] = request.user
return context

if status != "PARTIALLY_AUTHENTICATED":
context['authenticated'] = False
context['message'] = "Accountkit could not authenticate the user"
context['user'] = None
Expand Down Expand Up @@ -90,24 +95,18 @@ def login_status(request):
context['user'] = None
return context

if not request.user.is_authenticated:
login(request, user)
context['authenticated'] = True
context['message'] = "User with username %s logged in" % username
context['user'] = user
return context
else:
login(request, user)
context['authenticated'] = True
context['message'] = "User with username %s logged in" % username
context['user'] = user
return context

login(request, user)
context['authenticated'] = True
context['message'] = "User with username %s logged in" % username
context['user'] = user
return context


@csrf_exempt
def success_page(request):
context = login_status(request)
return render(request, 'success.html', context)

def login_view(request):
context = {}

context['api_version'] = api_version
context['accountkit_secret'] = accountkit_secret
context['accountkit_app_id'] = accountkit_app_id
return render(request, 'index.html', context)
2 changes: 1 addition & 1 deletion django_accountkit/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^$', login_view, name='login-view'),
url(r'^success$', login_status, name='success-view')
url(r'^success$', success_page, name='success-view')
]

0 comments on commit 82b6a5d

Please sign in to comment.