fixed #151: get_application_model incompatible with Django 1.7

Author: synasius

oauth2_provider/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from .models import get_application_model
+from .models import Application
 
 
 class AllowForm(forms.Form):
@@ -24,5 +24,5 @@ class RegistrationForm(forms.ModelForm):
     TODO: add docstring
     """
     class Meta:
-        model = get_application_model()
+        model = Application
         fields = ('name', 'client_id', 'client_secret', 'client_type', 'authorization_grant_type', 'redirect_uris')

oauth2_provider/oauth2_validators.py

@@ -11,19 +11,17 @@
 from oauthlib.oauth2 import RequestValidator
 
 from .compat import unquote_plus
-from .models import Grant, AccessToken, RefreshToken, get_application_model
+from .models import Grant, AccessToken, RefreshToken, get_application_model, AbstractApplication
 from .settings import oauth2_settings
 
-Application = get_application_model()
-
 log = logging.getLogger('oauth2_provider')
 
 GRANT_TYPE_MAPPING = {
-    'authorization_code': (Application.GRANT_AUTHORIZATION_CODE,),
-    'password': (Application.GRANT_PASSWORD,),
-    'client_credentials': (Application.GRANT_CLIENT_CREDENTIALS,),
-    'refresh_token': (Application.GRANT_AUTHORIZATION_CODE, Application.GRANT_PASSWORD,
-                      Application.GRANT_CLIENT_CREDENTIALS)
+    'authorization_code': (AbstractApplication.GRANT_AUTHORIZATION_CODE,),
+    'password': (AbstractApplication.GRANT_PASSWORD,),
+    'client_credentials': (AbstractApplication.GRANT_CLIENT_CREDENTIALS,),
+    'refresh_token': (AbstractApplication.GRANT_AUTHORIZATION_CODE, AbstractApplication.GRANT_PASSWORD,
+                      AbstractApplication.GRANT_CLIENT_CREDENTIALS)
 }
 
 
@@ -117,6 +115,7 @@ def _load_application(self, client_id, request):
         # we want to be sure that request has the client attribute!
         assert hasattr(request, "client"), "'request' instance has no 'client' attribute"
 
+        Application = get_application_model()
         try:
             request.client = request.client or Application.objects.get(client_id=client_id)
             return request.client
@@ -149,7 +148,7 @@ def client_authentication_required(self, request, *args, **kwargs):
 
         self._load_application(request.client_id, request)
         if request.client:
-            return request.client.client_type == Application.CLIENT_CONFIDENTIAL
+            return request.client.client_type == AbstractApplication.CLIENT_CONFIDENTIAL
 
         return super(OAuth2Validator, self).client_authentication_required(request,
                                                                            *args, **kwargs)
@@ -179,7 +178,7 @@ def authenticate_client_id(self, client_id, request, *args, **kwargs):
         """
         if self._load_application(client_id, request) is not None:
             log.debug("Application %s has type %s" % (client_id, request.client.client_type))
-            return request.client.client_type != Application.CLIENT_CONFIDENTIAL
+            return request.client.client_type != AbstractApplication.CLIENT_CONFIDENTIAL
         return False
 
     def confirm_redirect_uri(self, client_id, code, redirect_uri, client, *args, **kwargs):
@@ -253,9 +252,9 @@ def validate_response_type(self, client_id, response_type, client, request, *arg
         rfc:`8.4`, so validate the response_type only if it matches 'code' or 'token'
         """
         if response_type == 'code':
-            return client.authorization_grant_type == Application.GRANT_AUTHORIZATION_CODE
+            return client.authorization_grant_type == AbstractApplication.GRANT_AUTHORIZATION_CODE
         elif response_type == 'token':
-            return client.authorization_grant_type == Application.GRANT_IMPLICIT
+            return client.authorization_grant_type == AbstractApplication.GRANT_IMPLICIT
         else:
             return False
 

oauth2_provider/views/application.py

@@ -11,12 +11,10 @@ class ApplicationOwnerIsUserMixin(LoginRequiredMixin):
     """
     This mixin is used to provide an Application queryset filtered by the current request.user.
     """
-    model = get_application_model()
     fields = '__all__'
 
     def get_queryset(self):
-        queryset = super(ApplicationOwnerIsUserMixin, self).get_queryset()
-        return queryset.filter(user=self.request.user)
+        return get_application_model().objects.filter(user=self.request.user)
 
 
 class ApplicationRegistration(LoginRequiredMixin, CreateView):

oauth2_provider/views/base.py

@@ -17,8 +17,6 @@
 from ..models import get_application_model
 from .mixins import OAuthLibMixin
 
-Application = get_application_model()
-
 log = logging.getLogger('oauth2_provider')
 
 
@@ -116,7 +114,7 @@ def get(self, request, *args, **kwargs):
             kwargs['scopes_descriptions'] = [oauth2_settings.SCOPES[scope] for scope in scopes]
             kwargs['scopes'] = scopes
             # at this point we know an Application instance with such client_id exists in the database
-            application = Application.objects.get(client_id=credentials['client_id'])  # TODO: cache it!
+            application = get_application_model().objects.get(client_id=credentials['client_id'])  # TODO: cache it!
             kwargs['application'] = application
             kwargs.update(credentials)
             self.oauth2_data = kwargs
@@ -147,7 +145,7 @@ def get(self, request, *args, **kwargs):
                         uri, headers, body, status = self.create_authorization_response(
                             request=self.request, scopes=" ".join(scopes),
                             credentials=credentials, allow=True)
-                        return HttpResponseUriRedirect(uri)                            
+                        return HttpResponseUriRedirect(uri)
 
             return self.render_to_response(self.get_context_data(**kwargs))