From a7dad0da01613595b33793979a45e64e3a7a9ef7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sun, 19 Jan 2014 21:12:37 +0000 Subject: [PATCH] LAtest docs build --- api-guide/authentication.html | 3 +++ api-guide/generic-views.html | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/api-guide/authentication.html b/api-guide/authentication.html index e6147e7b1..f99b8a2c5 100644 --- a/api-guide/authentication.html +++ b/api-guide/authentication.html @@ -185,6 +185,7 @@
  • Digest Authentication
  • Django OAuth Toolkit
  • Django OAuth2 Consumer
    • +
  • JSON Web Token Authentication
    • @@ -478,6 +479,8 @@ class ExampleAuthentication(authentication.BaseAuthentication):

    The Django OAuth Toolkit package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+. The package is maintained by Evonove and uses the excelllent OAuthLib. The package is well documented, and comes as a recommended alternative for OAuth 2.0 support.

    Django OAuth2 Consumer

    The Django OAuth2 Consumer library from Rediker Software is another package that provides OAuth 2.0 support for REST framework. The package includes token scoping permissions on tokens, which allows finer-grained access to your API.

    +

    JSON Web Token Authentication

    +

    JSON Web Token is a fairly new standard which can be used for token-based authentication. Unlike the built-in TokenAuthentication scheme, JWT Authentication doesn't need to use a database to validate a token. Blimp maintains the djangorestframework-jwt package which provides a JWT Authentication class as well as a mechanism for clients to obtain a JWT given the username and password.

    diff --git a/api-guide/generic-views.html b/api-guide/generic-views.html index 9e856491a..284ecf4e1 100644 --- a/api-guide/generic-views.html +++ b/api-guide/generic-views.html @@ -6,7 +6,7 @@ - + @@ -191,6 +191,8 @@
  • Customizing the generic views
  • Creating custom mixins
  • Creating custom base classes
    • +
  • Third party packages
    • +
  • Django REST Framework bulk
    • @@ -451,6 +453,10 @@ class BaseRetrieveUpdateDestroyView(MultipleFieldLookupMixin, pass

    Using custom base classes is a good option if you have custom behavior that consistently needs to be repeated across a large number of views throughout your project.

    +

    Third party packages

    +

    The following third party packages provide additional generic view implementations.

    +

    Django REST Framework bulk

    +

    The django-rest-framework-bulk package implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.