Merge pull request #3386 from ishank011/thumbnails-download-fix

Use the default server download protocol if spaces are not supported
owncloud · Mar 30, 2022 · 1140061 · 1140061
2 parents cb46d5a + 2410032
commit 1140061
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/changelog/unreleased/thumbnails-download-fix.md b/changelog/unreleased/thumbnails-download-fix.md
@@ -0,0 +1,3 @@
+Bugfix: Use the default server download protocol if spaces are not supported
+
+https://github.com/owncloud/ocis/pull/3386
diff --git a/thumbnails/pkg/thumbnail/imgsource/cs3.go b/thumbnails/pkg/thumbnail/imgsource/cs3.go
@@ -74,8 +74,12 @@ func (s CS3) Get(ctx context.Context, path string) (io.ReadCloser, error) {
 	for _, p := range rsp.Protocols {
 		if p.Protocol == "spaces" {
 			ep, tk = p.DownloadEndpoint, p.Token
+			break
 		}
 	}
+	if (ep == "" || tk == "") && len(rsp.Protocols) > 0 {
+		ep, tk = rsp.Protocols[0].DownloadEndpoint, rsp.Protocols[0].Token
+	}
 
 	httpReq, err := rhttp.NewRequest(ctx, "GET", ep, nil)
 	if err != nil {