Skip to content

Commit a022b88

Browse files
committed
Fix bad error check in rest endpoint
1 parent e19deed commit a022b88

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

internal/rest/v1/project.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ func (h *Handlers) getProjectLanguage(ctx echo.Context, l *logrus.Entry) error {
6060
return echo.NewHTTPError(499, "client closed request")
6161
}
6262

63-
if ctx.Request() == nil {
64-
l.Error("Request is nil")
65-
66-
return errors.New("request is nil")
67-
}
68-
69-
if ctx.Request().Header.Get("If-None-Match") == trans.Checksum {
70-
return ctx.NoContent(http.StatusNotModified)
71-
}
72-
7363
if err != nil {
7464
switch err.(type) {
7565
case *poedit.ErrProjectPermissionDenied:
@@ -83,6 +73,16 @@ func (h *Handlers) getProjectLanguage(ctx echo.Context, l *logrus.Entry) error {
8373
}
8474
}
8575

76+
if ctx.Request() == nil {
77+
l.Error("Request is nil")
78+
79+
return errors.New("request is nil")
80+
}
81+
82+
if ctx.Request().Header.Get("If-None-Match") == trans.Checksum {
83+
return ctx.NoContent(http.StatusNotModified)
84+
}
85+
8686
ctx.Response().Header().Add("Etag", trans.Checksum)
8787
ctx.Response().Header().Add("Cache-Control", fmt.Sprintf("max-age=%.0f", trans.TTL.Seconds()))
8888
ctx.Response().Header().Add("Content-Disposition", fmt.Sprintf("filename=%d-%s.%s", req.Project, req.Language, contentMeta.Extension))

0 commit comments

Comments
 (0)