From 5239362951956f130a1ef91d12d6b7d680220104 Mon Sep 17 00:00:00 2001
From: Philip Forget
Date: Thu, 14 Nov 2013 18:02:07 -0500
Subject: pass oauth_timestamp to oauth_provider

---
 rest_framework/authentication.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/authentication.py')

diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py
index cf001a24..bca542eb 100644
--- a/rest_framework/authentication.py
+++ b/rest_framework/authentication.py
@@ -281,7 +281,8 @@ class OAuthAuthentication(BaseAuthentication):
         """
         Checks nonce of request, and return True if valid.
         """
-        return oauth_provider_store.check_nonce(request, oauth_request, oauth_request['oauth_nonce'])
+        return oauth_provider_store.check_nonce(request, oauth_request,
+            oauth_request['oauth_nonce'], oauth_request['oauth_timestamp'])
 
 
 class OAuth2Authentication(BaseAuthentication):
-- 
cgit v1.2.3


From a87c55a93a7ca380bc49425cc6df00f4eba99aa2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 13 Dec 2013 21:57:07 +0000
Subject: Compat fixes for django-oauth-plus versions 2.0-2.2.1

---
 rest_framework/authentication.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'rest_framework/authentication.py')

diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py
index bca542eb..e491ce5f 100644
--- a/rest_framework/authentication.py
+++ b/rest_framework/authentication.py
@@ -9,7 +9,7 @@ from django.core.exceptions import ImproperlyConfigured
 from rest_framework import exceptions, HTTP_HEADER_ENCODING
 from rest_framework.compat import CsrfViewMiddleware
 from rest_framework.compat import oauth, oauth_provider, oauth_provider_store
-from rest_framework.compat import oauth2_provider, provider_now
+from rest_framework.compat import oauth2_provider, provider_now, check_nonce
 from rest_framework.authtoken.models import Token
 
 
@@ -281,8 +281,9 @@ class OAuthAuthentication(BaseAuthentication):
         """
         Checks nonce of request, and return True if valid.
         """
-        return oauth_provider_store.check_nonce(request, oauth_request,
-            oauth_request['oauth_nonce'], oauth_request['oauth_timestamp'])
+        oauth_nonce = oauth_request['oauth_nonce']
+        oauth_timestamp = oauth_request['oauth_timestamp']
+        return check_nonce(request, oauth_request, oauth_nonce, oauth_timestamp)
 
 
 class OAuth2Authentication(BaseAuthentication):
-- 
cgit v1.2.3