using get_application_model

Author: Massimiliano

oauth2_provider/forms.py

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

oauth2_provider/models.py

@@ -96,9 +96,9 @@ def clean(self):
         from django.core.exceptions import ValidationError
         if not self.redirect_uris \
             and self.authorization_grant_type \
-            in (Application.GRANT_ALLINONE,
-                Application.GRANT_AUTHORIZATION_CODE,
-                Application.GRANT_IMPLICIT):
+            in (AbstractApplication.GRANT_ALLINONE,
+                AbstractApplication.GRANT_AUTHORIZATION_CODE,
+                AbstractApplication.GRANT_IMPLICIT):
             error = _('Redirect_uris could not be empty with {} grant_type')
             raise ValidationError(error.format(self.authorization_grant_type))
 
@@ -131,7 +131,7 @@ class Grant(models.Model):
     """
     user = models.ForeignKey(User)
     code = models.CharField(max_length=255)  # code comes from oauthlib
-    application = models.ForeignKey(Application)
+    application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
     redirect_uri = models.CharField(max_length=255)
     scope = models.TextField(blank=True)
@@ -166,7 +166,7 @@ class AccessToken(models.Model):
     """
     user = models.ForeignKey(User)
     token = models.CharField(max_length=255)
-    application = models.ForeignKey(Application)
+    application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
     scope = models.TextField(blank=True)
 
@@ -218,7 +218,7 @@ class RefreshToken(models.Model):
     """
     user = models.ForeignKey(User)
     token = models.CharField(max_length=255)
-    application = models.ForeignKey(Application)
+    application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     access_token = models.OneToOneField(AccessToken,
                                         related_name='refresh_token')
 

oauth2_provider/tests/test_application_views.py

@@ -4,7 +4,10 @@
 from django.test import TestCase
 
 from ..compat import get_user_model
-from ..models import Application
+from ..models import get_application_model
+
+
+Application = get_application_model()
 
 
 class BaseTest(TestCase):

oauth2_provider/tests/test_authorization_code.py

@@ -7,13 +7,16 @@
 from django.utils import timezone
 
 from ..compat import urlparse, parse_qs, urlencode, get_user_model
-from ..models import Application, Grant
+from ..models import get_application_model, Grant
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 
 from .test_utils import TestCaseUtils
 
 
+Application = get_application_model()
+
+
 # mocking a protected resource view
 class ResourceView(ProtectedResourceView):
     def get(self, request, *args, **kwargs):

oauth2_provider/tests/test_client_credential.py

@@ -9,14 +9,17 @@
 from oauthlib.oauth2 import BackendApplicationServer
 
 from ..compat import get_user_model
-from ..models import Application
+from ..models import get_application_model
 from ..oauth2_validators import OAuth2Validator
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 from ..views.mixins import OAuthLibMixin
 from .test_utils import TestCaseUtils
 
 
+Application = get_application_model()
+
+
 # mocking a protected resource view
 class ResourceView(ProtectedResourceView):
     def get(self, request, *args, **kwargs):

oauth2_provider/tests/test_implicit.py

@@ -4,11 +4,14 @@
 from django.core.urlresolvers import reverse
 
 from ..compat import urlparse, parse_qs, urlencode, get_user_model
-from ..models import Application
+from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 
 
+Application = get_application_model()
+
+
 # mocking a protected resource view
 class ResourceView(ProtectedResourceView):
     def get(self, request, *args, **kwargs):

oauth2_provider/tests/test_models.py

@@ -4,7 +4,10 @@
 from django.core.exceptions import ValidationError
 
 from ..compat import get_user_model
-from ..models import AccessToken, Application
+from ..models import AccessToken, get_application_model
+
+
+Application = get_application_model()
 
 
 class TestModels(TestCase):

oauth2_provider/tests/test_password.py

@@ -6,13 +6,16 @@
 from django.core.urlresolvers import reverse
 
 from ..compat import get_user_model
-from ..models import Application
+from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 
 from .test_utils import TestCaseUtils
 
 
+Application = get_application_model()
+
+
 # mocking a protected resource view
 class ResourceView(ProtectedResourceView):
     def get(self, request, *args, **kwargs):

oauth2_provider/tests/test_rest_framework.py

@@ -8,10 +8,13 @@
 
 from .test_utils import TestCaseUtils
 from ..compat import get_user_model
-from ..models import AccessToken, Application
+from ..models import AccessToken, get_application_model
 from ..settings import oauth2_settings
 
 
+Application = get_application_model()
+
+
 try:
     from rest_framework import permissions
     from rest_framework.views import APIView

oauth2_provider/tests/test_scopes.py

@@ -7,13 +7,16 @@
 from django.core.urlresolvers import reverse
 
 from ..compat import urlparse, parse_qs, get_user_model
-from ..models import Application, Grant, AccessToken
+from ..models import get_application_model, Grant, AccessToken
 from ..settings import oauth2_settings
 from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView
 
 from .test_utils import TestCaseUtils
 
 
+Application = get_application_model()
+
+
 # mocking a protected resource view
 class ScopeResourceView(ScopedProtectedResourceView):
     required_scopes = ['scope1']