Merge branch 'master' into loganbertram/BB2-3483-ag-expiration-format

Author: loganbertram

apps/docs/templates/oauth2-redirect.html

@@ -32,6 +32,7 @@
             let clientId = oauth2.auth.clientId
             let clientSecret = oauth2.auth.clientSecret;
             let redirectUri = oauth2.redirectUrl
+            let codeVerifier = oauth2.auth.codeVerifier
 
               // Convert client credentials to Base64
             const credentials = btoa(`${clientId}:${clientSecret}`);
@@ -44,6 +45,7 @@
                 },
                 body: new URLSearchParams({
                     code: code,
+                    code_verifier: codeVerifier,
                     grant_type: 'authorization_code',
                     redirect_uri: redirectUri
                 })

apps/docs/templates/openapi.html

@@ -141,7 +141,8 @@
               clientId: clientId,
               clientSecret: clientSecret,
               scopeSeparator: " ",
-              scopes: scopes
+              scopes: scopes,
+              usePkceWithAuthorizationCodeGrant: true
           })
       }
 

requirements/requirements.dev.txt

@@ -256,9 +256,9 @@ dj-database-url==2.0.0 \
     --hash=sha256:9c9e5f7224f62635a787e9cc3c6762c9be2b19541a21e3c08fa573bd01609b4b \
     --hash=sha256:a35a9f0f43775ca6f90d819dc456233ef7bcc76b47377d5d908b75c7eb320624
     # via -r requirements/requirements.in
-django==4.2.15 \
-    --hash=sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30 \
-    --hash=sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a
+django==4.2.16 \
+    --hash=sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898 \
+    --hash=sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad
     # via
     #   -r requirements/requirements.in
     #   dj-database-url

requirements/requirements.in

@@ -1,5 +1,5 @@
 # base packages
-django == 4.2.15
+django == 4.2.16
 django-bootstrap-v5
 django-cors-headers
 django-localflavor

requirements/requirements.txt

@@ -225,9 +225,9 @@ dj-database-url==2.0.0 \
     --hash=sha256:9c9e5f7224f62635a787e9cc3c6762c9be2b19541a21e3c08fa573bd01609b4b \
     --hash=sha256:a35a9f0f43775ca6f90d819dc456233ef7bcc76b47377d5d908b75c7eb320624
     # via -r requirements/requirements.in
-django==4.2.15 \
-    --hash=sha256:61ee4a130efb8c451ef3467c67ca99fdce400fedd768634efc86a68c18d80d30 \
-    --hash=sha256:c77f926b81129493961e19c0e02188f8d07c112a1162df69bfab178ae447f94a
+django==4.2.16 \
+    --hash=sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898 \
+    --hash=sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad
     # via
     #   -r requirements/requirements.in
     #   dj-database-url