update webui/crypto.py to use camodel

truenas · Jan 17, 2025 · f9a2a0e · f9a2a0e
1 parent 2f48334
commit f9a2a0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/middlewared/middlewared/plugins/crypto_/ca_profiles.py b/src/middlewared/middlewared/plugins/crypto_/ca_profiles.py
@@ -17,4 +17,4 @@ async def profiles(self):
         Returns a dictionary of predefined options for
         creating certificate authority requests.
         """
-        return CAModel().model_dump()
+        return CAModel().model_dump(by_alias=True)
diff --git a/src/middlewared/middlewared/plugins/webui/crypto.py b/src/middlewared/middlewared/plugins/webui/crypto.py
@@ -1,5 +1,8 @@
 from middlewared.api import api_method
 from middlewared.api.current import (
+    CAModel,
+    CAModelArgs,
+    CAModelResult,
     CERTPROFILES,
     CertProfilesArgs,
     CertProfilesResult,
@@ -26,9 +29,13 @@ class Config:
     async def certificate_profiles(self):
         return CERTPROFILES
 
-    @accepts(roles=['READONLY_ADMIN'])
+    @api_method(
+        CAModelArgs,
+        CAModelResult,
+        roles=['READONLY_ADMIN']
+    )
     async def certificateauthority_profiles(self):
-        return await self.middleware.call('certificateauthority.profiles')
+        return CAModel().model_dump(by_alias=True)
 
     @accepts(Int('cert_id'), roles=['READONLY_ADMIN'])
     async def get_certificate_domain_names(self, cert_id):