Merge pull request #109 from browserstack/fix_extra_fields

fix: revert extraFields change

Author: vedharish

Access/accessrequest_helper.py

@@ -405,15 +405,17 @@ def create_request(auth_user, access_request_form):
         }
 
         access_module = helper.get_available_access_modules()[access_tag]
+        module_access_labels = access_module.validate_request(
+            access_labels, auth_user, is_group=False
+        )
+
         extra_field_labels = get_extra_field_labels(access_module)
+
         if extra_fields and extra_field_labels:
             for field in extra_field_labels:
-                access_labels[0][field] = extra_fields[0]
+                module_access_labels[0][field] = extra_fields[0]
                 extra_fields = extra_fields[1:]
 
-        module_access_labels = access_module.validate_request(
-            access_labels, auth_user, is_group=False
-        )
 
         for index2, access_label in enumerate(module_access_labels):
             request_id = request_id + "_" + str(index2)
@@ -516,10 +518,7 @@ def get_extra_field_labels(access_module):
 def get_extra_fields(access_request):
     if "extraFields" in access_request:
         return access_request["extraFields"]
-    elif "extraFields[]" in access_request:
-        return [access_request["extraFields[]"]]
-    else:
-        return []
+    return []
 
 
 def _validate_access_request(access_request_form, user):

Access/group_helper.py

@@ -664,17 +664,19 @@ def save_group_access_request(form_data, auth_user):
             access_labels_json=access_request["accessLabel"][accessIndex],
             access_tag=access_tag,
         )
+
+        module_access_labels = access_module.validate_request(
+            access_labels, auth_user, is_group=False
+        )
+
         extra_fields = accessrequest_helper.get_extra_fields(access_request)
         extra_field_labels = accessrequest_helper.get_extra_field_labels(access_module)
 
         if extra_fields and extra_field_labels:
             for field in extra_field_labels:
-                access_labels[0][field] = extra_fields[0]
+                module_access_labels[0][field] = extra_fields[0]
                 extra_fields = extra_fields[1:]
 
-        module_access_labels = access_module.validate_request(
-            access_labels, auth_user, is_group=False
-        )
 
         request_id = (
             group.name