Fix tests

Author: loganbertram

apps/dot_ext/tests/demographic_scopes_test_cases.py

@@ -68,7 +68,7 @@
         "request_scopes": APPLICATION_SCOPES_FULL,
         # Result:
         "result_form_is_valid": True,
-        "result_token_scopes_granted": APPLICATION_SCOPES_NON_DEMOGRAPHIC,
+        "result_token_scopes_granted": APPLICATION_SCOPES_FULL,
     },
     "test 2: share_demographic_scopes = False": {
         # Request:

apps/dot_ext/tests/test_form_oauth2.py

@@ -31,6 +31,7 @@ def test_form(self):
         # Loop through test cases in dictionary.
         cases = FORM_OAUTH2_SCOPES_TEST_CASES
         for case in cases:
+            print(case)
             # Setup request parameters for test case.
             request_bene_share_demographic_scopes = cases[case]["request_bene_share_demographic_scopes"]
             request_scopes = cases[case]["request_scopes"]

apps/dot_ext/views/authorization.py

@@ -178,6 +178,12 @@ def form_valid(self, form):
         access_token_delete_cnt = 0
         refresh_token_delete_cnt = 0
 
+        # Did the beneficiary choose not to share demographic scopes, or the application does not require them?
+        if share_demographic_scopes == "False" or (allow is True and application.require_demographic_scopes is False):
+            (data_access_grant_delete_cnt,
+             access_token_delete_cnt,
+             refresh_token_delete_cnt) = remove_application_user_pair_tokens_data_access(application, self.request.user)
+
         if not scopes:
             return self.error_response("No scopes", application)
         try:
@@ -207,12 +213,6 @@ def form_valid(self, form):
                 data_access_grant_delete_cnt=data_access_grant_delete_cnt)
             return response
 
-        # Did the beneficiary choose not to share demographic scopes, or the application does not require them?
-        if share_demographic_scopes == "False" or (allow is True and application.require_demographic_scopes is False):
-            (data_access_grant_delete_cnt,
-             access_token_delete_cnt,
-             refresh_token_delete_cnt) = remove_application_user_pair_tokens_data_access(application, self.request.user)
-
         beneficiary_authorized_application.send(
             sender=self,
             request=self.request,