Fix

truenas · Jan 30, 2025 · 3646526 · 3646526
1 parent 50c3554
commit 3646526
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/middlewared/middlewared/api/v25_04_0/user.py b/src/middlewared/middlewared/api/v25_04_0/user.py
@@ -258,8 +258,9 @@ class UserTwofactorConfigEntry(BaseModel):
     otp_digits: int
 
 
-class UserTwofactorConfigResult(BaseModel):
-    result = UserTwofactorConfigEntry
+@single_argument_result
+class UserTwofactorConfigResult(UserTwofactorConfigEntry):
+    pass
 
 
 class UserVerifyTwofactorTokenArgs(BaseModel):
@@ -291,5 +292,6 @@ class UserRenew2faSecretArgs(BaseModel):
     twofactor_options: TwofactorOptions
 
 
+@single_argument_result
 class UserRenew2faSecretResult(UserEntry):
-    twofactor_config = UserTwofactorConfigEntry
+    twofactor_config: UserTwofactorConfigEntry
diff --git a/tests/unit/test_role_manager.py b/tests/unit/test_role_manager.py
@@ -20,7 +20,6 @@
 READONLY_ADMIN_METHODS = ALL_METHODS - WRITE_METHODS
 FULL_ADMIN_STIG = ALL_METHODS - FAKE_METHODS_NOSTIG
 EXPECTED_FA_RESOURCES = frozenset({
-    'user.verify_twofactor_token',
     'failover.reboot.other_node',
     'truenas.accept_eula',
     'filesystem.put',