Merge branch 'main' into feature/fix-in-release-flows-dashboard

Author: AlanJaeger

insights/authentication/authentication.py

@@ -6,16 +6,14 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
+from django.utils import translation
 from mozilla_django_oidc.auth import OIDCAuthenticationBackend
+from mozilla_django_oidc.contrib.drf import OIDCAuthentication
 from rest_framework.authentication import BaseAuthentication
 from rest_framework.exceptions import AuthenticationFailed
 
-from mozilla_django_oidc.contrib.drf import OIDCAuthentication
-from django.utils import translation
-
 from insights.users.usecases import CreateUserUseCase
 
-
 LOGGER = logging.getLogger("weni_django_oidc")
 
 User = get_user_model()

insights/projects/viewsets.py

@@ -60,7 +60,7 @@ def verify_project_indexer(self, request, source_slug=None, *args, **kwargs):
 
         project = Project.objects.get(pk=self.kwargs["pk"])
 
-        if str(project.pk) in settings.PROJECT_ALLOW_LIST:
+        if str(project.pk) in settings.PROJECT_ALLOW_LIST or project.is_allowed:
             return Response(True)
 
         return Response(False)
@@ -81,6 +81,8 @@ def release_flows_dashboard(self, request, *args, **kwargs):
 
             rollback_needed = False
             webhook_error = False
+            project.is_allowed = True
+            project.save()
 
             try:
                 project.is_allowed = True
@@ -117,6 +119,8 @@ def release_flows_dashboard(self, request, *args, **kwargs):
                         )
 
             if webhook_error:
+                project.is_allowed = original_is_allowed
+                project.save()
                 return Response(
                     {"detail": "Failed to process webhook request"},
                     status=status.HTTP_500_INTERNAL_SERVER_ERROR,