Skip to content

remove legacy unnormalized request headers in csgbot and langflow proxies #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaiHui886 merged 1 commit into from
May 8, 2026
Merged

remove legacy unnormalized request headers in csgbot and langflow proxies #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions builder/rpc/csgbot_svc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ type CsgbotSvcHttpClientImpl struct {
hc *HttpClient
}

func setCSGBotUserHeaders(hreq *http.Request, userUUID string, username string, token string) {
hreq.Header.Set(types.CSGBotHeaderUserUUID, userUUID)
hreq.Header.Set(types.CSGBotHeaderUserName, username)
hreq.Header.Set(types.CSGBotHeaderUserToken, token)
}

func NewCsgbotSvcHttpClient(endpoint string, opts ...RequestOption) CsgbotSvcClient {
return &CsgbotSvcHttpClientImpl{
hc: NewHttpClient(endpoint, opts...),
Expand All @@ -158,9 +164,7 @@ func (c *CsgbotSvcHttpClientImpl) DeleteWorkspaceFiles(ctx context.Context, user
return errorx.InternalServerError(err, rpcErrorCtx)
}
hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set("user_uuid", userUUID)
hreq.Header.Set("user_name", username)
hreq.Header.Set("user_token", token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -200,9 +204,7 @@ func (c *CsgbotSvcHttpClientImpl) UpdateWorkspaceFiles(ctx context.Context, user
}

hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set("user_uuid", userUUID)
hreq.Header.Set("user_name", username)
hreq.Header.Set("user_token", token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -241,9 +243,7 @@ func (c *CsgbotSvcHttpClientImpl) CreateKnowledgeBase(ctx context.Context, userU
return nil, errorx.InternalServerError(err, rpcErrorCtx)
}
hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set("user_uuid", userUUID)
hreq.Header.Set("user_name", username)
hreq.Header.Set("user_token", token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -293,9 +293,7 @@ func (c *CsgbotSvcHttpClientImpl) DeleteKnowledgeBase(ctx context.Context, userU
}

hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set("user_uuid", userUUID)
hreq.Header.Set("user_name", username)
hreq.Header.Set("user_token", token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -361,9 +359,7 @@ func (c *CsgbotSvcHttpClientImpl) UpdateKnowledgeBase(ctx context.Context, userU
return errorx.InternalServerError(err, rpcErrorCtx)
}
hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set("user_uuid", userUUID)
hreq.Header.Set("user_name", username)
hreq.Header.Set("user_token", token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -431,9 +427,7 @@ func (c *CsgbotSvcHttpClientImpl) doStreamChatRequest(ctx context.Context, path,

hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set(types.CSGBotHeaderRequestID, uuid.New().String())
hreq.Header.Set(types.CSGBotHeaderUserUUID, userUUID)
hreq.Header.Set(types.CSGBotHeaderUserName, username)
hreq.Header.Set(types.CSGBotHeaderUserToken, token)
setCSGBotUserHeaders(hreq, userUUID, username, token)
if stream {
hreq.Header.Set("Accept", "text/event-stream")
}
Expand Down Expand Up @@ -480,9 +474,7 @@ func (c *CsgbotSvcHttpClientImpl) CreateOpenClaw(ctx context.Context, userUUID,
}

hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set(types.CSGBotHeaderUserUUID, userUUID)
hreq.Header.Set(types.CSGBotHeaderUserName, username)
hreq.Header.Set(types.CSGBotHeaderUserToken, token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down Expand Up @@ -526,9 +518,7 @@ func (c *CsgbotSvcHttpClientImpl) DeleteOpenClaw(ctx context.Context, userUUID,
}

hreq.Header.Set("Content-Type", "application/json")
hreq.Header.Set(types.CSGBotHeaderUserUUID, userUUID)
hreq.Header.Set(types.CSGBotHeaderUserName, username)
hreq.Header.Set(types.CSGBotHeaderUserToken, token)
setCSGBotUserHeaders(hreq, userUUID, username, token)

hresp, err := c.hc.Do(hreq)
if err != nil {
Expand Down
54 changes: 27 additions & 27 deletions builder/rpc/csgbot_svc_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ func TestDeleteWorkspaceFiles_Success(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Return success
w.WriteHeader(http.StatusOK)
Expand Down Expand Up @@ -94,9 +94,9 @@ func TestUpdateWorkspaceFiles_Success(t *testing.T) {
assert.Equal(t, http.MethodPost, r.Method)

assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

var req UpdateWorkspaceFilesRequest
err := json.NewDecoder(r.Body).Decode(&req)
Expand Down Expand Up @@ -175,9 +175,9 @@ func TestCreateKnowledgeBase_Success(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Return success with response
w.Header().Set("Content-Type", "application/json")
Expand Down Expand Up @@ -245,9 +245,9 @@ func TestCreateKnowledgeBase_DescriptionIsEmpty(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Return success with response
w.Header().Set("Content-Type", "application/json")
Expand Down Expand Up @@ -371,9 +371,9 @@ func TestDeleteKnowledgeBase_Success(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Verify request body
var reqBody DeleteKnowledgeBaseRequest
Expand Down Expand Up @@ -564,9 +564,9 @@ func TestUpdateKnowledgeBase_Success(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Verify request body
var reqBody UpdateKnowledgeBaseRequest
Expand Down Expand Up @@ -607,9 +607,9 @@ func TestUpdateKnowledgeBase_SuccessWithNameOnly(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Verify request body
var reqBody UpdateKnowledgeBaseRequest
Expand Down Expand Up @@ -650,9 +650,9 @@ func TestUpdateKnowledgeBase_SuccessWithDescriptionOnly(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Verify request body
var reqBody UpdateKnowledgeBaseRequest
Expand Down Expand Up @@ -690,9 +690,9 @@ func TestUpdateKnowledgeBase_SuccessWithEmptyRequest(t *testing.T) {

// Verify headers
assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
assert.Equal(t, userUUID, r.Header.Get("user_uuid"))
assert.Equal(t, username, r.Header.Get("user_name"))
assert.Equal(t, token, r.Header.Get("user_token"))
assert.Equal(t, userUUID, r.Header.Get(types.CSGBotHeaderUserUUID))
assert.Equal(t, username, r.Header.Get(types.CSGBotHeaderUserName))
assert.Equal(t, token, r.Header.Get(types.CSGBotHeaderUserToken))

// Verify request body is empty
var reqBody UpdateKnowledgeBaseRequest
Expand Down
Loading