removed misleading ALL_IN_ONE response type

Author: Massimiliano Pippi

oauth2_provider/models.py

@@ -42,13 +42,11 @@ class AbstractApplication(models.Model):
         (CLIENT_PUBLIC, _('Public')),
     )
 
-    GRANT_ALLINONE = 'all-in-one'
     GRANT_AUTHORIZATION_CODE = 'authorization-code'
     GRANT_IMPLICIT = 'implicit'
     GRANT_PASSWORD = 'password'
     GRANT_CLIENT_CREDENTIALS = 'client-credentials'
     GRANT_TYPES = (
-        (GRANT_ALLINONE, _('All-in-one generic')),
         (GRANT_AUTHORIZATION_CODE, _('Authorization code')),
         (GRANT_IMPLICIT, _('Implicit')),
         (GRANT_PASSWORD, _('Resource owner password-based')),
@@ -96,8 +94,7 @@ def clean(self):
         from django.core.exceptions import ValidationError
         if not self.redirect_uris \
             and self.authorization_grant_type \
-            in (AbstractApplication.GRANT_ALLINONE,
-                AbstractApplication.GRANT_AUTHORIZATION_CODE,
+            in (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))

oauth2_provider/oauth2_validators.py

@@ -17,11 +17,11 @@
 log = logging.getLogger('oauth2_provider')
 
 GRANT_TYPE_MAPPING = {
-    'authorization_code': (Application.GRANT_ALLINONE, Application.GRANT_AUTHORIZATION_CODE),
-    'password': (Application.GRANT_ALLINONE, Application.GRANT_PASSWORD),
-    'client_credentials': (Application.GRANT_ALLINONE, Application.GRANT_CLIENT_CREDENTIALS),
-    'refresh_token': (Application.GRANT_ALLINONE, Application.GRANT_AUTHORIZATION_CODE,
-                      Application.GRANT_PASSWORD, Application.GRANT_CLIENT_CREDENTIALS)
+    '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)
 }
 
 

oauth2_provider/tests/test_models.py

@@ -39,17 +39,6 @@ def test_allow_scopes(self):
         self.assertTrue(access_token.allow_scopes([]))
         self.assertFalse(access_token.allow_scopes(['write', 'destroy']))
 
-    def test_grant_allinone_redirect_uris(self):
-        app = Application(
-            name="test_app",
-            redirect_uris="",
-            user=self.user,
-            client_type=Application.CLIENT_CONFIDENTIAL,
-            authorization_grant_type=Application.GRANT_ALLINONE,
-        )
-
-        self.assertRaises(ValidationError, app.full_clean)
-
     def test_grant_authorization_code_redirect_uris(self):
         app = Application(
             name="test_app",