Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions provider/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def error_response(self, error, mimetype='application/json', status=400,
return HttpResponse(json.dumps(error), mimetype=mimetype,
status=status, **kwargs)

def access_token_response(self, access_token):
def access_token_response(self, access_token, refresh_token=None):
"""
Returns a successful response after creating the access token
as defined in :rfc:`5.1`.
Expand All @@ -451,7 +451,8 @@ def access_token_response(self, access_token):
json.dumps({
'access_token': access_token.token,
'expires_in': access_token.get_expire_delta(),
'refresh_token': access_token.refresh_token.token,
'refresh_token': refresh_token.token if refresh_token else \
access_token.refresh_token.token,
'scope': ' '.join(scope.names(access_token.scope)),
}), mimetype='application/json'
)
Expand All @@ -465,14 +466,15 @@ def authorization_code(self, request, data, client):
client)
if constants.SINGLE_ACCESS_TOKEN:
at = self.get_access_token(request, grant.user, grant.scope, client)
rt = None
else:
at = self.create_access_token(request, grant.user, grant.scope, client)
rt = self.create_refresh_token(request, grant.user, grant.scope, at,
client)

self.invalidate_grant(grant)

return self.access_token_response(at)
return self.access_token_response(at, rt)

def refresh_token(self, request, data, client):
"""
Expand All @@ -487,7 +489,7 @@ def refresh_token(self, request, data, client):
client)
rt = self.create_refresh_token(request, at.user, at.scope, at, client)

return self.access_token_response(at)
return self.access_token_response(at, rt)

def password(self, request, data, client):
"""
Expand All @@ -500,11 +502,12 @@ def password(self, request, data, client):

if constants.SINGLE_ACCESS_TOKEN:
at = self.get_access_token(request, user, scope, client)
rt = None
else:
at = self.create_access_token(request, user, scope, client)
rt = self.create_refresh_token(request, user, scope, at, client)

return self.access_token_response(at)
return self.access_token_response(at, rt)

def get_handler(self, grant_type):
"""
Expand Down