Этот коммит содержится в:
Ben Schumacher
2021-07-12 20:05:36 +02:00
коммит произвёл Claudio Costa
родитель 953eebdef4
Коммит 97ccf0bdf6
472 изменённых файлов: 9126 добавлений и 9132 удалений

Просмотреть файл

@@ -98,15 +98,15 @@ func (rcs *Service) sendFileToRemote(timeout time.Duration, task sendFileTask) (
if err != nil {
return nil, fmt.Errorf("invalid siteURL while sending file to remote %s: %w", task.rc.RemoteId, err)
}
u.Path = path.Join(u.Path, model.API_URL_SUFFIX, "remotecluster", "upload", task.us.Id)
u.Path = path.Join(u.Path, model.ApiUrlSuffix, "remotecluster", "upload", task.us.Id)
req, err := http.NewRequest("POST", u.String(), r)
if err != nil {
return nil, err
}
req.Header.Set(model.HEADER_REMOTECLUSTER_ID, task.rc.RemoteId)
req.Header.Set(model.HEADER_REMOTECLUSTER_TOKEN, task.rc.RemoteToken)
req.Header.Set(model.HeaderRemoteclusterId, task.rc.RemoteId)
req.Header.Set(model.HeaderRemoteclusterToken, task.rc.RemoteToken)
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()

Просмотреть файл

@@ -148,8 +148,8 @@ func (rcs *Service) sendFrameToRemote(timeout time.Duration, rc *model.RemoteClu
return nil, err
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set(model.HEADER_REMOTECLUSTER_ID, rc.RemoteId)
req.Header.Set(model.HEADER_REMOTECLUSTER_TOKEN, rc.RemoteToken)
req.Header.Set(model.HeaderRemoteclusterId, rc.RemoteId)
req.Header.Set(model.HeaderRemoteclusterToken, rc.RemoteToken)
resp, err := rcs.httpClient.Do(req.WithContext(ctx))
if metrics := rcs.server.GetMetrics(); metrics != nil {

Просмотреть файл

@@ -99,7 +99,7 @@ func (rcs *Service) sendProfileImageToRemote(timeout time.Duration, task sendPro
if err != nil {
return fmt.Errorf("invalid siteURL while sending file to remote %s: %w", task.rc.RemoteId, err)
}
u.Path = path.Join(u.Path, model.API_URL_SUFFIX, "remotecluster", task.userID, "image")
u.Path = path.Join(u.Path, model.ApiUrlSuffix, "remotecluster", task.userID, "image")
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
@@ -122,8 +122,8 @@ func (rcs *Service) sendProfileImageToRemote(timeout time.Duration, task sendPro
return err
}
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set(model.HEADER_REMOTECLUSTER_ID, task.rc.RemoteId)
req.Header.Set(model.HEADER_REMOTECLUSTER_TOKEN, task.rc.RemoteToken)
req.Header.Set(model.HeaderRemoteclusterId, task.rc.RemoteId)
req.Header.Set(model.HeaderRemoteclusterToken, task.rc.RemoteToken)
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()

Просмотреть файл

@@ -40,14 +40,14 @@ func TestService_sendProfileImageToRemote(t *testing.T) {
if shouldError.get() {
w.WriteHeader(http.StatusInternalServerError)
resp := make(map[string]string)
resp[model.STATUS] = model.STATUS_FAIL
resp[model.STATUS] = model.StatusFail
w.Write([]byte(model.MapToJson(resp)))
return
}
status := model.STATUS_OK
status := model.StatusOk
defer func(s *string) {
if *s != model.STATUS_OK {
if *s != model.StatusOk {
w.WriteHeader(http.StatusInternalServerError)
}
resp := make(map[string]string)
@@ -56,20 +56,20 @@ func TestService_sendProfileImageToRemote(t *testing.T) {
}(&status)
if err := r.ParseMultipartForm(1024 * 1024); err != nil {
status = model.STATUS_FAIL
status = model.StatusFail
assert.Fail(t, "connect parse multipart form", err)
return
}
m := r.MultipartForm
if m == nil {
status = model.STATUS_FAIL
status = model.StatusFail
assert.Fail(t, "multipart form missing")
return
}
imageArray, ok := m.File["image"]
if !ok || len(imageArray) != 1 {
status = model.STATUS_FAIL
status = model.StatusFail
assert.Fail(t, "image missing")
return
}
@@ -77,7 +77,7 @@ func TestService_sendProfileImageToRemote(t *testing.T) {
imageData := imageArray[0]
file, err := imageData.Open()
if err != nil {
status = model.STATUS_FAIL
status = model.StatusFail
assert.Fail(t, "cannot open multipart form file")
return
}
@@ -85,7 +85,7 @@ func TestService_sendProfileImageToRemote(t *testing.T) {
img, err := png.Decode(file)
if err != nil || imageWidth != img.Bounds().Max.X || imageHeight != img.Bounds().Max.Y {
status = model.STATUS_FAIL
status = model.StatusFail
assert.Fail(t, "cannot decode png", err)
return
}

Просмотреть файл

@@ -31,8 +31,8 @@ const (
ConfirmInviteURL = "api/v4/remotecluster/confirm_invite"
InvitationTopic = "invitation"
PingTopic = "ping"
ResponseStatusOK = model.STATUS_OK
ResponseStatusFail = model.STATUS_FAIL
ResponseStatusOK = model.StatusOk
ResponseStatusFail = model.StatusFail
InviteExpiresAfter = time.Hour * 48
)