allow admins to delete gateways, not requiring owner to be same

Author: andyshinn

bridger/cogs/mqtt.py

@@ -114,7 +114,7 @@ async def request_account(self, ctx: Interaction, node_id: str):
     @app_commands.checks.has_role(BRIDGER_ADMIN_ROLE)
     @app_commands.command(name="delete-account", description="Delete MQTT account")
     async def delete_account(self, ctx: Interaction, node_id: str):
-        if self.gateway_manager.delete_gateway_user(node_id, ctx.user):
+        if self.gateway_manager.delete_gateway_user(node_id):
             await ctx.response.send_message(f"Gateway deleted: {node_id}", ephemeral=True, delete_after=self.delete_after)
         else:
             await ctx.response.send_message(f"Gateway not found: {node_id}", ephemeral=True, delete_after=self.delete_after)

bridger/gateway.py

@@ -121,13 +121,11 @@ def create_gateway_user(self, gateway_id: str, discord_user: Union[User, Member]
                 raise GatewayError(f"Gateway already exists: {e}", gateway)
         return gateway, password
 
-    def delete_gateway_user(self, gateway_id: str, discord_user: Union[User, Member]) -> bool:
-        gateway_id, gateway_id_without_bang, node_id = self.prepare_gateway_id(gateway_id)
-        user = f"{discord_user.id}-{gateway_id_without_bang}"
-
+    def delete_gateway_user(self, gateway_id: str) -> bool:
         try:
-            self.emqx.delete_user(self.authentication_id, user)
-            self.emqx.delete_user_authorization_rules_built_in_database(user)
+            gateway = self.get_gateway(gateway_id)
+            self.emqx.delete_user(self.authentication_id, gateway.user_string)
+            self.emqx.delete_user_authorization_rules_built_in_database(gateway.user_string)
         except Exception:
             return False
 

tests/test_gateway.py

@@ -95,7 +95,7 @@ def test_delete_gateway_user(gateway_manager, emqx_mock):
     emqx_mock.delete_user.return_value = None
     emqx_mock.delete_user_authorization_rules_built_in_database.return_value = None
 
-    success = gateway_manager.delete_gateway_user("1a2b3c4d", mock_discord_user)
+    success = gateway_manager.delete_gateway_user("1a2b3c4d")
 
     assert success is True
     emqx_mock.delete_user.assert_called_once_with(gateway_manager.authentication_id, "1234567890-1a2b3c4d")
@@ -106,7 +106,7 @@ def test_delete_gateway_user(gateway_manager, emqx_mock):
 def test_delete_gateway_user_fail(gateway_manager, emqx_mock):
     emqx_mock.delete_user.side_effect = Exception("Deletion failed")
 
-    success = gateway_manager.delete_gateway_user("1a2b3c4d", mock_discord_user)
+    success = gateway_manager.delete_gateway_user("1a2b3c4d")
 
     assert success is False
     emqx_mock.delete_user.assert_called_once()