From d02b88867c05939953a93d186452caf865592070 Mon Sep 17 00:00:00 2001 From: Eero af Heurlin Date: Sun, 26 Jan 2025 13:56:17 +0200 Subject: [PATCH] make sure the latest user certs are written to tak folders as well --- src/takrmapi/tak_helpers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/takrmapi/tak_helpers.py b/src/takrmapi/tak_helpers.py index 4d8caee..e1cab35 100644 --- a/src/takrmapi/tak_helpers.py +++ b/src/takrmapi/tak_helpers.py @@ -348,6 +348,7 @@ async def user_cert_write(self) -> None: async def user_cert_validate(self) -> bool: """Check that the given certificate can at least be opened""" + await self.user_cert_write() try: cert_file_name = config.TAK_CERTS_FOLDER / f"{self.user.callsign}.pem" with open(cert_file_name, "rb") as cert_file: @@ -372,6 +373,8 @@ async def add_user_to_tak_with_cert(self) -> bool: # THIS SHOULD BE CHANGED TO BE DONE THROUGH REST IF POSSIBLE # Or via Pyjnius, or via PyIgnite # + if not await self.user_cert_validate(): + raise ValueError("User TAK certs not valid") tasks = [] for certname in self.enable_user_cert_names: tasks.append( @@ -404,7 +407,8 @@ async def add_admin_to_tak_with_cert(self) -> bool: # THIS SHOULD BE CHANGED TO BE DONE THROUGH REST IF POSSIBLE # Or via Pyjnius, or via PyIgnite # - + if not await self.user_cert_validate(): + raise ValueError("User TAK certs not valid") tasks = [] for certname in self.enable_user_cert_names: tasks.append( @@ -437,6 +441,8 @@ async def delete_user_with_cert(self) -> bool: # THIS SHOULD BE CHANGED TO BE DONE THROUGH REST IF POSSIBLE # Or via Pyjnius, or via PyIgnite # + if not await self.user_cert_validate(): + raise ValueError("User TAK certs not valid") tasks = [] for certname in self.enable_user_cert_names: tasks.append(