From f12cec1c533622ebf02173c2f886dbcac9ff92c8 Mon Sep 17 00:00:00 2001
From: Novak Zaballa <41410593+novakzaballa@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:20:13 -0400
Subject: [PATCH] Revert "feat: Add new url for roles master api keys (#3154)"

This reverts commit d7703994f700f078f1a569be1f0fb64923b19193.
---
 api/organisations/urls.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/api/organisations/urls.py b/api/organisations/urls.py
index 70ee6db0ab1e..ac9a3a00e8cb 100644
--- a/api/organisations/urls.py
+++ b/api/organisations/urls.py
@@ -102,7 +102,6 @@
         RoleEnvironmentPermissionsViewSet,
         RoleOrganisationPermissionViewSet,
         RoleProjectPermissionsViewSet,
-        RolesbyMasterAPIPrefixViewSet,
         RolesByGroupViewSet,
         RolesByUserViewSet,
         RoleViewSet,
@@ -113,14 +112,11 @@
         parent_router=organisations_router, parent_prefix=r"users", lookup="user"
     )
 
-    nested_api_key_roles_routes = routers.NestedSimpleRouter(
-        parent_router=organisations_router,
-        lookup="api_key",
-
     nested_group_roles_routes = routers.NestedSimpleRouter(
         parent_router=organisations_router, parent_prefix=r"groups", lookup="group"
     )
 
+    organisations_router.register("roles", RoleViewSet, basename="organisation-roles")
     nested_roles_router = routers.NestedSimpleRouter(
         organisations_router, r"roles", lookup="role"
     )
@@ -129,10 +125,6 @@
         viewset=RolesByUserViewSet,
         basename="role-users",
     )
-    nested_api_key_roles_routes.register(
-        prefix="roles",
-        viewset=RolesbyMasterAPIPrefixViewSet,
-        basename="role-api-keys",
     nested_group_roles_routes.register(
         prefix="roles",
         viewset=RolesByGroupViewSet,
@@ -163,7 +155,6 @@
             url(r"^", include(organisations_router.urls)),
             url(r"^", include(nested_roles_router.urls)),
             url(r"^", include(nested_user_roles_routes.urls)),
-            url(r"^", include(nested_api_key_roles_routes.urls)),
             url(r"^", include(nested_group_roles_routes.urls)),
         ]
     )