Skip to content

Commit 891d4af

Browse files
committed
refactor: revoke group Access
1 parent ef79daa commit 891d4af

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

Access/group_helper.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ def get_group_access_list(request, group_name):
201201
context["genericAccesses"] = [
202202
get_generic_access(group_mapping) for group_mapping in group_mappings
203203
]
204-
print(group_mappings)
205204
if context["genericAccesses"] == [{}]:
206205
context["genericAccesses"] = []
207206

@@ -803,7 +802,7 @@ def remove_member(request):
803802
return {"message": "Successfully removed user from group"}
804803

805804

806-
def mark_revoked(request):
805+
def revoke_access(request):
807806
try:
808807
request_id = request.POST.get("request_id")
809808
if not request_id:
@@ -820,7 +819,7 @@ def mark_revoked(request):
820819

821820
group = mapping.group
822821
auth_user = request.user
823-
if auth_user.user.has_permission("ALLOW_USER_OFFBOARD") and group.member_is_owner(auth_user.user):
822+
if not (auth_user.user.has_permission("ALLOW_USER_OFFBOARD") and group.member_is_owner(auth_user.user)):
824823
raise Exception("User Unauthorized to perfrom the action")
825824

826825
should_continue = False

Access/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def check_access_exist(self, access):
536536
return False
537537

538538
def get_all_approved_members(self):
539-
self.membership_group.filter(status="Approved")
539+
return self.membership_group.filter(status="Approved")
540540

541541
def get_approved_accesses(self):
542542
return self.group_access_mapping.filter(status="Approved")

Access/userlist_helper.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ def get_identity_templates(auth_user):
4141
context["configured_identity_template"] = []
4242
context["unconfigured_identity_template"] = []
4343
all_modules = helper.get_available_access_modules()
44-
for user_identity in user_identities:
45-
is_identity_configured = _is_valid_identity_json(identity=user_identity.identity)
46-
if is_identity_configured:
47-
module = all_modules[user_identity.access_tag]
48-
context["configured_identity_template"].append(
49-
{
50-
"accessUserTemplatePath": module.get_identity_template(),
51-
"identity" : user_identity.identity
52-
}
53-
)
54-
all_modules.pop(user_identity.access_tag)
44+
# for user_identity in user_identities:
45+
# is_identity_configured = _is_valid_identity_json(identity=user_identity.identity)
46+
# if is_identity_configured:
47+
# module = all_modules[user_identity.access_tag]
48+
# context["configured_identity_template"].append(
49+
# {
50+
# "accessUserTemplatePath": module.get_identity_template(),
51+
# "identity" : user_identity.identity
52+
# }
53+
# )
54+
# all_modules.pop(user_identity.access_tag)
5555

56-
for mod in all_modules.values():
57-
context["unconfigured_identity_template"].append(
58-
{
59-
"accessUserTemplatePath": mod.get_identity_template(),
60-
}
61-
)
56+
# for mod in all_modules.values():
57+
# context["unconfigured_identity_template"].append(
58+
# {
59+
# "accessUserTemplatePath": mod.get_identity_template(),
60+
# }
61+
# )
6262
# context["aws_username"] = "some name"
6363
return context
6464

BrowserStackAutomation/urls.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from django.contrib.auth import views as auth_views
1919
from django.urls import re_path, include
2020
from Access.views import (
21+
revoke_group_access,
2122
showAccessHistory,
2223
pendingRequests,
2324
pendingFailure,
@@ -81,6 +82,7 @@
8182
re_path(
8283
r"^group/removeGroupMember$", remove_group_member, name="remove_group_member"
8384
),
85+
re_path(r"^group/revokeAccess", revoke_group_access, name="revoke_group_access")
8486
]
8587

8688
# for each_module in getAvailableAccessModules():

templates/BSOps/group_access_list_tabs/generic_accesses_tab.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@
2828

2929
$(document).on('click', '.group-revoke-button', function(){
3030
id = $(this).attr("id");
31-
urlBuilder = "/group/markGroupAccessRevoked?requestId="+id
31+
32+
urlBuilder = "/group/revokeAccess"
3233
$.ajax({url: urlBuilder,
34+
method: "POST",
35+
data: {
36+
request_id: id,
37+
csrfmiddlewaretoken: '{{ csrf_token }}'
38+
},
3339
success: function(result){
3440
document.getElementById("inactive-"+id+"-revoke-button").innerHTML = "Access Marked Revoked";
3541
},

0 commit comments

Comments
 (0)