Optimize return prompt words
This commit is contained in:
1 parent
3c4e2be1dd
commit
ffc09b7b83
3 files changed
+13
-11
No files matched your search
@@ -75,7 +75,10 @@ def modify_apikey(request: Request, apikey_service: UserApiKeyService = Depends(
|
||||
expire_at = body.get("expire_at")
|
||||
if id is None:
|
||||
return ResponseUtils.error(message="id are required")
|
||||
apikey_obj = apikey_service.modify(id, user_id, name=name, description=description, expire_at=expire_at)
|
||||
if not apikey_obj:
|
||||
return ResponseUtils.error(message="Modify failed or not found or no permission")
|
||||
return ResponseUtils.success(data=convert_to_apikey_response(apikey_obj))
|
||||
try:
|
||||
apikey_obj = apikey_service.modify(id, user_id, name=name, description=description, expire_at=expire_at)
|
||||
if not apikey_obj:
|
||||
return ResponseUtils.error(message="Modify failed or not found or no permission")
|
||||
return ResponseUtils.success(data=convert_to_apikey_response(apikey_obj))
|
||||
except ValueError as e:
|
||||
return ResponseUtils.error(message=str(e))
|
||||
@@ -26,10 +26,9 @@ class ResourceGroupService:
|
||||
if gid != "deny-all" and gid != "allow-all":
|
||||
# 忽略大小写检查重复
|
||||
lower_name = name.strip().lower() if name else None
|
||||
if lower_name == "allow all" or lower_name == "deny all":
|
||||
raise ValueError("Invalid resource group name")
|
||||
if self.group_repo.check_name_duplicate(gid, name):
|
||||
if lower_name == "allow all" or lower_name == "deny all" or self.group_repo.check_name_duplicate(gid, name):
|
||||
raise ValueError("Resource group name \"{{name}}\" already exists")
|
||||
|
||||
group = ResourceGroup()
|
||||
group.id = gid
|
||||
group.name = name
|
||||
@@ -53,10 +52,7 @@ class ResourceGroupService:
|
||||
name = body.get("name","")
|
||||
# 忽略大小写检查重复
|
||||
lower_name = name.strip().lower() if name else None
|
||||
if lower_name == "allow all" or lower_name == "deny all":
|
||||
raise ValueError("Invalid resource group name")
|
||||
|
||||
if self.group_repo.check_name_duplicate(gid, name):
|
||||
if lower_name == "allow all" or lower_name == "deny all" or self.group_repo.check_name_duplicate(gid, name):
|
||||
raise ValueError("Resource group name \"{{name}}\" already exists")
|
||||
existing = self.group_repo.get_by_id(gid)
|
||||
if not existing:
|
||||
|
||||
@@ -25,6 +25,9 @@ class UserApiKeyService:
|
||||
def modify(
|
||||
self, id: str, user_id: str, name: Optional[str] = None, description: Optional[str] = None, expire_at: Optional[datetime] = None
|
||||
) -> Optional[UserApiKey]:
|
||||
"""Modify an existing API key."""
|
||||
if name and self.user_apikey_repository.check_user_apikey_by_name(user_id, name):
|
||||
raise ValueError("Auth key name \"{{name}}\" already exists")
|
||||
user_apikey = self.user_apikey_repository.get_by_id(id)
|
||||
if not user_apikey or user_apikey.user_id != user_id:
|
||||
return None
|
||||
|
||||
Reference in new issue
Block a user