Merge branch 'main' into enhancement-group-flow

Author: sumedha-bhatt

Access/helpers.py

@@ -26,11 +26,12 @@ def get_available_access_module_from_tag(tag):
 def get_available_access_modules():
     global available_accesses
     if len(available_accesses) > 0:
-        return available_accesses
+        return available_accesses.copy()
+
     available_accesses = {
         access.tag(): access for access in _get_modules_on_disk() if access.available
     }
-    return available_accesses
+    return available_accesses.copy()
 
 
 def _get_modules_on_disk():

Access/models.py

@@ -231,7 +231,7 @@ def get_user_access_mappings(self):
         access_request_mappings = []
         for each_identity in all_user_identities:
             access_request_mappings.extend(
-                each_identity.useraccessmapping_set.prefetch_related(
+                each_identity.user_access_mapping.prefetch_related(
                     "access", "approver_1", "approver_2"
                 )
             )
@@ -242,7 +242,7 @@ def get_access_history(self, all_access_modules):
         access_history = []
 
         for request_mapping in access_request_mappings:
-            access_module = all_access_modules[request_mapping.accessType]
+            access_module = all_access_modules[request_mapping.access.access_tag]
             access_history.append(
                 request_mapping.getAccessRequestDetails(access_module)
             )
@@ -877,6 +877,10 @@ def decline_access(self, decline_reason=None):
     def approve_access(self):
         self.status = "Approved"
         self.save()
+    
+    @staticmethod
+    def get_by_id(request_id):
+        return UserAccessMapping.objects.get(request_id=request_id)
 
     def revoking(self, revoker):
         self.revoker = revoker

Access/views.py

@@ -21,6 +21,7 @@
     accept_user_access_requests,
     get_decline_access_request,
     accept_group_access,
+    run_accept_request_task,
 )
 from Access.models import User, UserAccessMapping, GroupAccessMapping
 
@@ -618,3 +619,24 @@ def mark_revoked(request):
         logger.exception("Error Revoking User Access, Error: %s", str(ex))
         json_response["error"] = "Error Revoking User Access"
     return JsonResponse(json_response, status=403)
+
+def individual_resolve(request):
+    json_response = {"status_list":[]}
+    try:
+        request_ids = request.GET.getlist('requestId')
+        if not request_ids:
+            raise Exception("Request id not found in the request")
+        
+        for request_id in request_ids:
+            user_access_mapping = UserAccessMapping.get_by_id(request_id)
+            if user_access_mapping.status.lower() in ["grantfailed", "approved"]:
+                response = run_accept_request_task(False, user_access_mapping, request.user, user_access_mapping.request_id, user_access_mapping.access.access_label)
+                json_response["status_list"] += response["status"]
+            else:
+                json_response["status_list"].append({'title': 'The Request ('+request_id+') is already resolved.', 'msg': 'The request is already in final state.'})
+        return render(request,'BSOps/accessStatus.html',json_response)
+    except Exception as e:
+        logger.exception(str(e))
+        json_response['error'] = {'error_msg': "Bad request", 'msg': "Error in request not found OR Invalid request type"}
+        return render(request,'BSOps/accessStatus.html',json_response)
+    

BrowserStackAutomation/urls.py

@@ -39,6 +39,7 @@
     decline_access,
     update_group_owners,
     remove_group_member,
+    individual_resolve
 )
 from Access.helpers import get_available_access_modules
 
@@ -90,6 +91,7 @@
     re_path(
         r"^group/removeGroupMember$", remove_group_member, name="remove_group_member"
     ),
+    re_path(r"^individual_resolve$", individual_resolve, name="individual_resolve")
 ]
 
 for tag, each_module in get_available_access_modules().items():