External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2705 from rooftopcellist/oauth2_typo

Browse Source 
fix OAuth typos
This commit is contained in:
Christian Adams
2018-07-30 10:42:54 -04:00
committed by GitHub
parent 681d64c96f 1303f3f82f
commit 5a7b519101
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/authentication.py
View File

@@ -11,7 +11,7 @@ from django.utils.encoding import smart_text
# Django REST Framework # Django REST Framework
from rest_framework import authentication from rest_framework import authentication
# Django OAuth Toolkit # Django-OAuth-Toolkit
from oauth2_provider.contrib.rest_framework import OAuth2Authentication from oauth2_provider.contrib.rest_framework import OAuth2Authentication
logger = logging.getLogger('awx.api.authentication') logger = logging.getLogger('awx.api.authentication')
@@ -48,7 +48,7 @@ class LoggedOAuth2Authentication(OAuth2Authentication):
user, token = ret user, token = ret
username = user.username if user else '<none>' username = user.username if user else '<none>'
logger.info(smart_text( logger.info(smart_text(
u"User {} performed a {} to {} through the API using OAuth token {}.".format( u"User {} performed a {} to {} through the API using OAuth 2 token {}.".format(
username, request.method, request.path, token.pk username, request.method, request.path, token.pk
) )
)) ))

4
docs/auth/oauth.md
View File

@@ -231,7 +231,7 @@ implies 'read' as well.
## Application Functions ## Application Functions
This page lists OAuth utility endpoints used for authorization, token refresh and revoke. This page lists OAuth 2 utility endpoints used for authorization, token refresh and revoke.
Note endpoints other than `/api/o/authorize/` are not meant to be used in browsers and do not Note endpoints other than `/api/o/authorize/` are not meant to be used in browsers and do not
support HTTP GET. The endpoints here strictly follow support HTTP GET. The endpoints here strictly follow
[RFC specs for OAuth 2](https://tools.ietf.org/html/rfc6749), so please use that for detailed [RFC specs for OAuth 2](https://tools.ietf.org/html/rfc6749), so please use that for detailed
@@ -434,7 +434,7 @@ at /api/v2/tokens/.
## Acceptance Criteria ## Acceptance Criteria
* All CRUD operations for OAuth 2 applications and tokens should function as described. * All CRUD operations for OAuth 2 applications and tokens should function as described.
* RBAC rules applied to OAuth applications and tokens should behave as described. * RBAC rules applied to OAuth 2 applications and tokens should behave as described.
* A default application should be auto-created for each new user. * A default application should be auto-created for each new user.
* Incoming requests using unexpired OAuth 2 token correctly in authentication header should be able * Incoming requests using unexpired OAuth 2 token correctly in authentication header should be able
to successfully authenticate themselves. to successfully authenticate themselves.