Skip to content

Commit ac9d63e

Browse files
committed
feat(rest-client): set api-key in the header
1 parent 59a202c commit ac9d63e

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.github/workflows/build-image.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- .github/workflows/CI.yaml
99
- .github/workflows/lint.yaml
1010
- .github/pull_request_template.yml
11+
- pkg/rest-client
1112
- README.md
1213

1314
env:

pkg/rest-client/client.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@ func (rc *RestClient) UploadFileReader(chatId int64, fileName string, fileReader
3939
params := url.Values{}
4040
params.Set("chat_id", fmt.Sprintf("%d", chatId))
4141
params.Set("file_name", fileName)
42-
params.Set("api-key", rc.apiKey)
4342
var finalUrl = fmt.Sprintf("%s/%s?%s", rc.getApiUrl(), "files", params.Encode())
44-
response, err := rc.client.Post(finalUrl, "application/octet-stream", fileReader)
43+
request, err := http.NewRequest(http.MethodPost, finalUrl, fileReader)
44+
if err != nil {
45+
return v1.MessageIdentifier{}, err
46+
}
47+
request.Header.Set("Content-Type", "application/octet-stream")
48+
response, err := rc.do(request)
4549
if err != nil {
4650
return v1.MessageIdentifier{}, err
4751
}
@@ -71,9 +75,12 @@ func (rc *RestClient) DownloadFileReader(identifier v1.MessageIdentifier, copyCh
7175
params.Set("chat_id", fmt.Sprintf("%d", identifier.ChatId))
7276
params.Set("msg_id", fmt.Sprintf("%d", identifier.MessageId))
7377
params.Set("draft_chat_id", fmt.Sprintf("%d", copyChat))
74-
params.Set("api-key", rc.apiKey)
7578
var finalUrl = fmt.Sprintf("%s/%s?%s", rc.getApiUrl(), "files", params.Encode())
76-
response, err := rc.client.Get(finalUrl)
79+
request, err := http.NewRequest(http.MethodGet, finalUrl, nil)
80+
if err != nil {
81+
return nil, err
82+
}
83+
response, err := rc.do(request)
7784
if err != nil {
7885
return nil, err
7986
}
@@ -119,3 +126,8 @@ func (rc *RestClient) DownloadFileBuffer(identifier v1.MessageIdentifier, copyCh
119126
FileInfo: result.FileInfo,
120127
}, nil
121128
}
129+
130+
func (rc *RestClient) do(req *http.Request) (*http.Response, error) {
131+
req.Header.Set("api-key", rc.apiKey)
132+
return rc.client.Do(req)
133+
}

0 commit comments

Comments
 (0)