zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-25 17:42:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Go: merge functions (#16622)

Browse Source 
### Summary

Merge HTTP response functions into common/response.go

---------

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2026-07-06 18:14:05 +08:00
committed by GitHub
parent ed52255868
commit b3d536c48e
49 changed files with 2046 additions and 4342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
internal/handler/api_token.go
View File

@@ -18,6 +18,7 @@ package handler
import (
"net/http"
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
@@ -30,19 +31,13 @@ func (h *SystemHandler) ListAPIKeys(c *gin.Context) {
// Get current user from context
user, exists := c.Get("user")
if !exists {
c.JSON(http.StatusUnauthorized, gin.H{
"code": 401,
"message": "Unauthorized",
})
common.ResponseWithHttpCodeData(c, http.StatusUnauthorized, 401, nil, "Unauthorized")
return
}
userModel, ok := user.(*entity.User)
if !ok {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Invalid user data",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Invalid user data")
return
}
@@ -50,10 +45,7 @@ func (h *SystemHandler) ListAPIKeys(c *gin.Context) {
userTenantDAO := dao.NewUserTenantDAO()
tenants, err := userTenantDAO.GetByUserIDAndRole(userModel.ID, "owner")
if err != nil || len(tenants) == 0 {
c.JSON(http.StatusBadRequest, gin.H{
"code": 400,
"message": "Tenant not found",
})
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Tenant not found")
return
}
@@ -62,37 +54,24 @@ func (h *SystemHandler) ListAPIKeys(c *gin.Context) {
// Get keys for the tenant
keys, err := h.systemService.ListAPIKeys(tenantID)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Failed to list keys",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Failed to list keys")
return
}
c.JSON(http.StatusOK, gin.H{
"code": 0,
"message": "success",
"data": keys,
})
common.SuccessWithData(c, keys, "success")
}
func (h *SystemHandler) CreateKey(c *gin.Context) {
// Get current user from context
user, exists := c.Get("user")
if !exists {
c.JSON(http.StatusUnauthorized, gin.H{
"code": 401,
"message": "Unauthorized",
})
common.ResponseWithHttpCodeData(c, http.StatusUnauthorized, 401, nil, "Unauthorized")
return
}
userModel, ok := user.(*entity.User)
if !ok {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Invalid user data",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Invalid user data")
return
}
@@ -100,10 +79,7 @@ func (h *SystemHandler) CreateKey(c *gin.Context) {
userTenantDAO := dao.NewUserTenantDAO()
tenants, err := userTenantDAO.GetByUserIDAndRole(userModel.ID, "owner")
if err != nil || len(tenants) == 0 {
c.JSON(http.StatusBadRequest, gin.H{
"code": 400,
"message": "Tenant not found",
})
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Tenant not found")
return
}
@@ -111,48 +87,32 @@ func (h *SystemHandler) CreateKey(c *gin.Context) {
// Parse request
var req service.CreateAPIKeyRequest
if err := c.ShouldBind(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"code": 400,
"message": "Invalid request",
})
if err = c.ShouldBind(&req); err != nil {
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Invalid request")
return
}
// Create key
key, err := h.systemService.CreateAPIKey(tenantID, &req)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Failed to create key",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Failed to create key")
return
}
c.JSON(http.StatusOK, gin.H{
"code": 0,
"message": "success",
"data": key,
})
common.SuccessWithData(c, key, "success")
}
func (h *SystemHandler) DeleteKey(c *gin.Context) {
// Get current user from context
user, exists := c.Get("user")
if !exists {
c.JSON(http.StatusUnauthorized, gin.H{
"code": 401,
"message": "Unauthorized",
})
common.ResponseWithHttpCodeData(c, http.StatusUnauthorized, 401, nil, "Unauthorized")
return
}
userModel, ok := user.(*entity.User)
if !ok {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Invalid user data",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Invalid user data")
return
}
@@ -160,10 +120,7 @@ func (h *SystemHandler) DeleteKey(c *gin.Context) {
userTenantDAO := dao.NewUserTenantDAO()
tenants, err := userTenantDAO.GetByUserIDAndRole(userModel.ID, "owner")
if err != nil || len(tenants) == 0 {
c.JSON(http.StatusBadRequest, gin.H{
"code": 400,
"message": "Tenant not found",
})
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Tenant not found")
return
}
@@ -172,25 +129,15 @@ func (h *SystemHandler) DeleteKey(c *gin.Context) {
// Get key from path parameter
key := c.Param("key")
if key == "" {
c.JSON(http.StatusBadRequest, gin.H{
"code": 400,
"message": "Key is required",
})
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Key is required")
return
}
// Delete key
if err = h.systemService.DeleteAPIKey(tenantID, key); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"code": 500,
"message": "Failed to delete key",
})
common.ResponseWithHttpCodeData(c, http.StatusInternalServerError, 500, nil, "Failed to delete key")
return
}
c.JSON(http.StatusOK, gin.H{
"code": 0,
"message": "success",
"data": true,
})
common.SuccessWithData(c, true, "success")
}