upgrade to oauth2client 3.0.0 & django 1.10

Avinash · Avinash · commit 34b5f2c73540 · 2016-08-26T19:18:53.000-07:00
diff --git a/samples/django_sample/plus/models.py b/samples/django_sample/plus/models.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.models import User
 from django.db import models
 
-from oauth2client.contrib.django_orm import CredentialsField
+from oauth2client.contrib.django_util.models import CredentialsField
 
 
 class CredentialsModel(models.Model):
diff --git a/samples/django_sample/plus/views.py b/samples/django_sample/plus/views.py
@@ -11,7 +11,7 @@
 from django_sample import settings
 from oauth2client.contrib import xsrfutil
 from oauth2client.client import flow_from_clientsecrets
-from oauth2client.contrib.django_orm import Storage
+from oauth2client.contrib.django_util.storage import DjangoORMStorage
 
 # CLIENT_SECRETS, name of a file containing the OAuth 2.0 information for this
 # application, including client_id and client_secret, which are found
@@ -27,7 +27,7 @@
 
 @login_required
 def index(request):
-  storage = Storage(CredentialsModel, 'id', request.user, 'credential')
+  storage = DjangoORMStorage(CredentialsModel, 'id', request.user, 'credential')
   credential = storage.get()
   if credential is None or credential.invalid == True:
     FLOW.params['state'] = xsrfutil.generate_token(settings.SECRET_KEY,
@@ -50,10 +50,10 @@ def index(request):
 
 @login_required
 def auth_return(request):
-  if not xsrfutil.validate_token(settings.SECRET_KEY, request.REQUEST['state'],
+  if not xsrfutil.validate_token(settings.SECRET_KEY, str(request.GET['state']),
                                  request.user):
     return  HttpResponseBadRequest()
   credential = FLOW.step2_exchange(request.REQUEST)
-  storage = Storage(CredentialsModel, 'id', request.user, 'credential')
+  storage = DjangoORMStorage(CredentialsModel, 'id', request.user, 'credential')
   storage.put(credential)
   return HttpResponseRedirect("/")
