Sem-ver: api-break Remove the deprecated atlassian_jwt_auth.contrib.django and atlassian_jwt_auth.contrib.flask_app code

requires_asap has been added to atlassian_jwt_auth.frameworks.django
Likewise requires_asap has been added to atlassian_jwt_auth.frameworks.flask

Signed-off-by: David Black <dblack@atlassian.com>

Author: dbaxa

atlassian_jwt_auth/contrib/django/__init__.py

@@ -1,4 +1,10 @@
-from .decorators import restrict_asap, with_asap
+from .decorators import requires_asap, restrict_asap, with_asap
 from .middleware import OldStyleASAPMiddleware, asap_middleware
 
-__all__ = ["restrict_asap", "with_asap", "OldStyleASAPMiddleware", "asap_middleware"]
+__all__ = [
+    "restrict_asap",
+    "with_asap",
+    "requires_asap",
+    "OldStyleASAPMiddleware",
+    "asap_middleware",
+]

atlassian_jwt_auth/contrib/django/decorators.py

@@ -63,3 +63,20 @@ def restrict_asap(
         required,
         subject_should_match_issuer=None,
     )
+
+
+def requires_asap(
+    issuers: Optional[Iterable[str]] = None,
+    subject_should_match_issuer: Optional[bool] = None,
+    func: Optional[Callable] = None,
+) -> Callable:
+    """Decorator for Django endpoints to require ASAP
+
+    :param list issuers: *required The 'iss' claims that this endpoint is from.
+    """
+    return with_asap(
+        func=func,
+        required=True,
+        issuers=issuers,
+        subject_should_match_issuer=subject_should_match_issuer,
+    )

atlassian_jwt_auth/contrib/django/middleware.py

@@ -196,18 +196,6 @@ def test_request_decorated_issuer_is_allowed(self):
             retriever_key="whitelist/key01",
         )
 
-    # TODO: modify JWTAuthSigner to allow non-issuer subjects and update the
-    # decorated subject test cases
-    def test_request_non_decorated_subject_is_rejected(self):
-        self.check_response(
-            "restricted_subject",
-            "Forbidden",
-            403,
-            issuer="whitelist",
-            key_id="whitelist/key01",
-            retriever_key="whitelist/key01",
-        )
-
     def test_request_using_settings_only_is_allowed(self):
         self.check_response("unneeded", "two")
 

atlassian_jwt_auth/contrib/flask_app/__init__.py

@@ -29,9 +29,4 @@
         views.restricted_issuer_view,
         name="restricted_issuer",
     ),
-    path(
-        "asap/restricted_subject",
-        views.restricted_subject_view,
-        name="restricted_subject",
-    ),
 ]