refactor: access_type to access_tag

Author: niveshm

Access/accessrequest_helper.py

@@ -379,26 +379,26 @@ def create_request(auth_user, access_request_form):
     json_response["status_list"] = []
     extra_fields = get_extra_fields(access_request=access_request)
 
-    for index1, access_type in enumerate(access_request["accessRequests"]):
+    for index1, access_tag in enumerate(access_request["accessRequests"]):
         access_labels = validate_access_labels(
             access_labels_json=access_request["accessLabel"][index1],
-            access_tag=access_type,
+            access_tag=access_tag,
         )
         access_reason = access_request["accessReason"][index1]
 
         request_id = (
             auth_user.username
             + "-"
-            + access_type
+            + access_tag
             + "-"
             + datetime.datetime.utcnow().strftime("%Y%m%d%H%M%S")
         )
-        json_response[access_type] = {
+        json_response[access_tag] = {
             "requestId": request_id,
             "dateTime": current_date_time,
         }
 
-        access_module = helper.get_available_access_modules()[access_type]
+        access_module = helper.get_available_access_modules()[access_tag]
         module_access_labels = access_module.validate_request(
             access_labels, auth_user, is_group=False
         )
@@ -415,7 +415,7 @@ def create_request(auth_user, access_request_form):
             access_create_error = _create_access(
                 auth_user=auth_user,
                 access_label=access_label,
-                access_type=access_type,
+                access_tag=access_tag,
                 request_id=request_id,
                 access_reason=access_reason,
             )
@@ -448,17 +448,17 @@ def create_request(auth_user, access_request_form):
     return json_response
 
 
-def _create_access(auth_user, access_label, access_type, request_id, access_reason):
-    user_identity = auth_user.user.get_active_identity(access_tag=access_type)
+def _create_access(auth_user, access_label, access_tag, request_id, access_reason):
+    user_identity = auth_user.user.get_active_identity(access_tag=access_tag)
     if not user_identity:
         return {
             "title": REQUEST_IDENTITY_NOT_SETUP_ERR_MSG["error_msg"],
             "msg": REQUEST_IDENTITY_NOT_SETUP_ERR_MSG["msg"].format(
-                access_tag=access_type
+                access_tag=access_tag
             ),
         }
 
-    access = AccessV2.get(access_type=access_type, access_label=access_label)
+    access = AccessV2.get(access_tag=access_tag, access_label=access_label)
     if access:
         if user_identity.access_mapping_exists(access):
             return {
@@ -476,7 +476,7 @@ def _create_access(auth_user, access_label, access_type, request_id, access_reas
             user_identity=user_identity,
             request_id=request_id,
             access_label=access_label,
-            access_type=access_type,
+            access_tag=access_tag,
             access_reason=access_reason,
         )
     except Exception:
@@ -488,11 +488,11 @@ def _create_access(auth_user, access_label, access_type, request_id, access_reas
 
 @transaction.atomic
 def _create_access_mapping(
-    user_identity, access, request_id, access_type, access_label, access_reason
+    user_identity, access, request_id, access_tag, access_label, access_reason
 ):
     if not access:
         access = AccessV2.objects.create(
-            access_tag=access_type, access_label=access_label
+            access_tag=access_tag, access_label=access_label
         )
 
     user_identity.user_access_mapping.create(

Access/models.py

@@ -1090,10 +1090,10 @@ def __str__(self):
             return self.access_tag
 
     @staticmethod
-    def get(access_type, access_label):
+    def get(access_tag, access_label):
         try:
             return AccessV2.objects.get(
-                access_tag=access_type, access_label=access_label
+                access_tag=access_tag, access_label=access_label
             )
         except AccessV2.DoesNotExist:
             return None

Access/userlist_helper.py

@@ -49,9 +49,6 @@ def get_identity_templates(auth_user):
     context["unconfigured_identity_template"] = []
     all_modules = helper.get_available_access_modules()
     for user_identity in user_identities:
-        if not all_modules[user_identity.access_tag].get_identity_template():
-            all_modules.pop(user_identity.access_tag)
-            continue
         is_identity_configured = _is_valid_identity_json(
             identity=user_identity.identity
         )
@@ -67,9 +64,10 @@ def get_identity_templates(auth_user):
 
     for mod in all_modules.values():
         if not mod.get_identity_template():
-            auth_user.user.create_new_identity(
-                access_tag=mod.tag(), identity={}
-            )
+            if not auth_user.user.get_active_identity(mod.tag()):
+                auth_user.user.create_new_identity(
+                    access_tag=mod.tag(), identity={}
+                )
             continue
         context["unconfigured_identity_template"].append(
             {