aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRob Romano2012-11-13 16:49:13 -0800
committerRob Romano2012-11-14 12:51:00 -0800
commit321ba156ca45da8a4b3328c4aec6a9235f32e5f8 (patch)
tree51bdbb438943c052cc4c7ef702e4b78cb721498a /docs
parenteb20b5663e68ce01453eeb855922874001f42d0f (diff)
downloaddjango-rest-framework-321ba156ca45da8a4b3328c4aec6a9235f32e5f8.tar.bz2
Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example.
Diffstat (limited to 'docs')
-rw-r--r--docs/api-guide/authentication.md11
-rw-r--r--docs/topics/credits.md3
-rw-r--r--docs/topics/release-notes.md1
3 files changed, 8 insertions, 7 deletions
diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index a55059a8..a30bd22c 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -114,18 +114,15 @@ If you've already created some User`'s, you can run a script like this.
When using TokenAuthentication, it may be useful to add a login view for clients to retrieve the token.
-REST framework provides a built-in login view. To use it, add a pattern to include the token login view for clients as follows:
+REST framework provides a built-in login view for clients to retrieve the token called `rest_framework.authtoken.obtain_auth_token`. To use it, add a pattern to include the token login view for clients as follows:
urlpatterns += patterns('',
- url(r'^api-token-auth/', include('rest_framework.authtoken.urls',
- namespace='rest_framework'))
+ url(r'^api-token-auth/', 'rest_framework.authtoken.obtain_auth_token')
)
-The `r'^api-token-auth/'` part of pattern can actually be whatever URL you want to use. The only restriction is that the included urls must use the `'rest_framework'` namespace.
+The `r'^api-token-auth/'` part of pattern can actually be whatever URL you want to use. The authtoken login view will render a JSON response when a valid `username` and `password` fields are POST'ed to the view using forms or JSON:
-The authtoken login view will render a JSON response when a valid `username` and `password` fields are POST'ed to the view using forms or JSON:
-
- { 'token' : '9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b' }
+ { 'token' : '9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b' }
## OAuthAuthentication
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8e71c937..939dfc57 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -60,6 +60,7 @@ The following people have helped make REST framework great.
* Ben Konrath - [benkonrath]
* Marc Aymerich - [glic3rinu]
* Ludwig Kraatz - [ludwigkraatz]
+* Rob Romano - [robromano]
Many thanks to everyone who's contributed to the project.
@@ -155,3 +156,5 @@ To contact the author directly:
[benkonrath]: https://github.com/benkonrath
[glic3rinu]: https://github.com/glic3rinu
[ludwigkraatz]: https://github.com/ludwigkraatz
+[robromano]: https://github.com/robromano
+
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 35e8a8b3..daacc76f 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -7,6 +7,7 @@
## Master
* Support for `read_only_fields` on `ModelSerializer` classes.
+* Add convenience login view to get tokens when using `TokenAuthentication`
## 2.1.2