summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-03-01 10:18:36 +0900
committerenahum <nahumhbl@gmail.com>2017-02-28 22:18:36 -0300
commit28c218db3bbdcc0776be1be91ff4acbd0586f590 (patch)
tree10259512af822b378a93e105cb2608e039324001
parent2a621f7470476b0f10d6241a13fdcfd838748edd (diff)
downloadchat-28c218db3bbdcc0776be1be91ff4acbd0586f590.tar.gz
chat-28c218db3bbdcc0776be1be91ff4acbd0586f590.tar.bz2
chat-28c218db3bbdcc0776be1be91ff4acbd0586f590.zip
Implementation endpoint of APIv4: GET /files/{file_id}/thumbnail (#5553)
* APIv4: GET /files/{file_id}/thumbnail * added delay time
-rw-r--r--api4/file.go33
-rw-r--r--api4/file_test.go52
-rw-r--r--model/client4.go11
3 files changed, 96 insertions, 0 deletions
diff --git a/api4/file.go b/api4/file.go
index b486fc220..924f7e416 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -23,6 +23,7 @@ func InitFile() {
BaseRoutes.Files.Handle("", ApiSessionRequired(uploadFile)).Methods("POST")
BaseRoutes.File.Handle("", ApiSessionRequired(getFile)).Methods("GET")
+ BaseRoutes.File.Handle("/thumbnail", ApiSessionRequired(getFileThumbnail)).Methods("GET")
}
@@ -92,6 +93,38 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
}
}
+func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) {
+ c.RequireFileId()
+ if c.Err != nil {
+ return
+ }
+
+ info, err := app.GetFileInfo(c.Params.FileId)
+ if err != nil {
+ c.Err = err
+ return
+ }
+
+ if info.CreatorId != c.Session.UserId && !app.SessionHasPermissionToChannelByPost(c.Session, info.PostId, model.PERMISSION_READ_CHANNEL) {
+ c.SetPermissionError(model.PERMISSION_READ_CHANNEL)
+ return
+ }
+
+ if info.ThumbnailPath == "" {
+ c.Err = model.NewLocAppError("getFileThumbnail", "api.file.get_file_thumbnail.no_thumbnail.app_error", nil, "file_id="+info.Id)
+ c.Err.StatusCode = http.StatusBadRequest
+ return
+ }
+
+ if data, err := app.ReadFile(info.ThumbnailPath); err != nil {
+ c.Err = err
+ c.Err.StatusCode = http.StatusNotFound
+ } else if err := writeFileResponse(info.Name, info.MimeType, data, w, r); err != nil {
+ c.Err = err
+ return
+ }
+}
+
func writeFileResponse(filename string, contentType string, bytes []byte, w http.ResponseWriter, r *http.Request) *model.AppError {
w.Header().Set("Cache-Control", "max-age=2592000, public")
w.Header().Set("Content-Length", strconv.Itoa(len(bytes)))
diff --git a/api4/file_test.go b/api4/file_test.go
index d47dd6cb1..f8f57cdb8 100644
--- a/api4/file_test.go
+++ b/api4/file_test.go
@@ -149,3 +149,55 @@ func TestGetFile(t *testing.T) {
_, resp = th.SystemAdminClient.GetFile(fileId)
CheckNoError(t, resp)
}
+
+func TestGetFileThumbnail(t *testing.T) {
+ th := Setup().InitBasic().InitSystemAdmin()
+ defer TearDown()
+ Client := th.Client
+ channel := th.BasicChannel
+
+ if utils.Cfg.FileSettings.DriverName == "" {
+ t.Skip("skipping because no file driver is enabled")
+ }
+
+ fileId := ""
+ var sent []byte
+ var err error
+ if sent, err = readTestFile("test.png"); err != nil {
+ t.Fatal(err)
+ } else {
+ fileResp, resp := Client.UploadFile(sent, channel.Id, "test.png")
+ CheckNoError(t, resp)
+
+ fileId = fileResp.FileInfos[0].Id
+ }
+
+ // Wait a bit for files to ready
+ time.Sleep(2 * time.Second)
+
+ data, resp := Client.GetFileThumbnail(fileId)
+ CheckNoError(t, resp)
+
+ if data == nil || len(data) == 0 {
+ t.Fatal("should not be empty")
+ }
+
+ _, resp = Client.GetFileThumbnail("junk")
+ CheckBadRequestStatus(t, resp)
+
+ _, resp = Client.GetFileThumbnail(model.NewId())
+ CheckNotFoundStatus(t, resp)
+
+ Client.Logout()
+ _, resp = Client.GetFileThumbnail(fileId)
+ CheckUnauthorizedStatus(t, resp)
+
+ otherUser := th.CreateUser()
+ Client.Login(otherUser.Email, otherUser.Password)
+ _, resp = Client.GetFileThumbnail(fileId)
+ CheckForbiddenStatus(t, resp)
+
+ Client.Logout()
+ _, resp = th.SystemAdminClient.GetFileThumbnail(fileId)
+ CheckNoError(t, resp)
+}
diff --git a/model/client4.go b/model/client4.go
index 8d2423ad9..d3bb6534d 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -882,6 +882,17 @@ func (c *Client4) GetFile(fileId string) ([]byte, *Response) {
}
}
+// GetFileThumbnail gets the bytes for a file by id.
+func (c *Client4) GetFileThumbnail(fileId string) ([]byte, *Response) {
+ if r, err := c.DoApiGet(c.GetFileRoute(fileId)+"/thumbnail", ""); err != nil {
+ return nil, &Response{StatusCode: r.StatusCode, Error: err}
+ } else if data, err := ioutil.ReadAll(r.Body); err != nil {
+ return nil, &Response{StatusCode: r.StatusCode, Error: NewAppError("GetFileThumbnail", "model.client.read_file.app_error", nil, err.Error(), r.StatusCode)}
+ } else {
+ return data, BuildResponse(r)
+ }
+}
+
// GetFileInfosForPost gets all the file info objects attached to a post.
func (c *Client4) GetFileInfosForPost(postId string, etag string) ([]*FileInfo, *Response) {
if r, err := c.DoApiGet(c.GetPostRoute(postId)+"/files/info", etag); err != nil {