Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…

…Khan/Remove-Degreed-Unencrypted-Columns-ENT8009

.github/workflows/ci.yml

@@ -16,8 +16,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8']
-        toxenv: [quality, docs, django32-celery53, django42-celery53, django32-pii-annotations]
+        python-version:
+        - '3.8'
+        - '3.11'
+        toxenv: [quality, docs, django42-celery53, django42-pii-annotations]
     env:
       RUNJSHINT: true
     steps:
@@ -26,7 +28,7 @@ jobs:
       run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: ${{ matrix.python-version }}
         architecture: x64
     - uses: actions/setup-node@v2
       with:
@@ -37,11 +39,12 @@ jobs:
         TOXENV: ${{ matrix.toxenv }}
       run: tox
     - name: Run code coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
-      uses: codecov/codecov-action@v3
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'django42-celery53'
+      uses: codecov/codecov-action@v4
       with:
         flags: unittests
         fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Run jshint
       if: matrix.toxenv=='django42-celery53'     # Only run this once as part of tests
       run: |

CHANGELOG.rst

@@ -15,6 +15,15 @@ Change Log
 
 Unreleased
 ----------
+
+[4.16.1]
+---------
+* fix: add enterprise audit reporting status in plotly auth token
+
+[4.16.0]
+---------
+* feat: Adding python3.11 support. Dropped django32 support.
+
 [4.15.12]
 ---------
 * feat: update enterprise customer serializer to include active integration codes

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.15.12"
+__version__ = "4.16.1"

enterprise/api/v1/views/plotly_auth.py

@@ -12,6 +12,8 @@
 from django.conf import settings
 from django.http import JsonResponse
 
+from enterprise.models import EnterpriseCustomer
+
 
 class PlotlyAuthView(generics.GenericAPIView):
     """
@@ -41,8 +43,20 @@ def get(self, request, enterprise_uuid):
 
         jwt_payload = dict({
             'enterprise_uuid': enterprise_uuid,
+            'audit_data_reporting_enabled': self._is_audit_data_reporting_enabled(enterprise_uuid),
         }, **CLAIMS)
 
         token = jwt.encode(jwt_payload, secret_key, algorithm='HS512')
         json_payload = {'token': token}
         return JsonResponse(json_payload)
+
+    @staticmethod
+    def _is_audit_data_reporting_enabled(enterprise_uuid):
+        """
+        Check if audit data reporting is enabled for the enterprise.
+
+        Args:
+            enterprise_uuid (str): UUID of the enterprise.
+        """
+        enterprise = EnterpriseCustomer.objects.filter(uuid=enterprise_uuid).first()
+        return getattr(enterprise, 'enable_audit_data_reporting', False)

pylintrc

@@ -64,7 +64,7 @@
 # SERIOUSLY.
 #
 # ------------------------------
-# Generated by edx-lint version: 5.3.4
+# Generated by edx-lint version: 5.3.6
 # ------------------------------
 [MASTER]
 ignore = migrations
@@ -291,6 +291,7 @@ disable =
 	logging-format-interpolation,
 	no-member,
 	missing-timeout,
+	use-yield-from,
 
 [REPORTS]
 output-format = text
@@ -387,4 +388,4 @@ int-import-graph =
 [EXCEPTIONS]
 overgeneral-exceptions = builtins.Exception
 
-# 852b6fff3b5db38083c340a20de6cc6024cc0c00
+# 126dc53d1644a269339811dea1e20f5bd1bf3264