Determine req method based on wopiserver response

cs3org · Aug 10, 2021 · d5cb5a4 · d5cb5a4
1 parent 07d5c97
commit d5cb5a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/internal/http/services/appprovider/appprovider.go b/internal/http/services/appprovider/appprovider.go
@@ -31,7 +31,6 @@ import (
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/internal/http/services/ocmd"
-	"github.com/cs3org/reva/pkg/appctx"
 	"github.com/cs3org/reva/pkg/rgrpc/status"
 	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
 	"github.com/cs3org/reva/pkg/rhttp/global"
@@ -113,9 +112,6 @@ func (s *svc) Handler() http.Handler {
 
 func (s *svc) handleList(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	log := appctx.GetLogger(ctx)
-	log.Info().Msgf("user agent %+v", r.UserAgent())
-
 	client, err := pool.GetGatewayServiceClient(s.conf.GatewaySvc)
 	if err != nil {
 		ocmd.WriteError(w, r, ocmd.APIErrorServerError, "error getting grpc gateway client", err)

diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go
@@ -171,8 +171,8 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc
 	}
 	defer openRes.Body.Close()
 
-	if openRes.StatusCode != http.StatusFound {
-		return nil, errors.Wrap(err, "wopi: unexpected status from WOPI server: "+openRes.Status)
+	if openRes.StatusCode != http.StatusOK {
+		return nil, errtypes.InternalError("wopi: unexpected status from WOPI server: " + openRes.Status)
 	}
 
 	body, err := ioutil.ReadAll(openRes.Body)
@@ -192,13 +192,25 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc
 	}
 
 	appFullURL := result["app-url"].(string)
-	formParams := result["form-parameters"].(map[string]string)
-	formParams["access_token_ttl"] = tokenTTL
+
+	// Depending on whether wopi server returned any form parameters or not,
+	// we decide whether the request method is POST or GET
+	var formParams map[string]string
+	method := "GET"
+	if form, ok := result["form-parameters"].(map[string]interface{}); ok {
+		if tkn, ok := form["access_token"].(string); ok {
+			formParams = map[string]string{
+				"access_token":     tkn,
+				"access_token_ttl": tokenTTL,
+			}
+			method = "POST"
+		}
+	}
 
 	log.Info().Msg(fmt.Sprintf("wopi: returning app URL %s", appFullURL))
 	return &appprovider.OpenInAppURL{
 		AppUrl:         appFullURL,
-		Method:         "POST",
+		Method:         method,
 		FormParameters: formParams,
 	}, nil
 }

diff --git a/pkg/app/registry/static/static.go b/pkg/app/registry/static/static.go
@@ -154,11 +154,13 @@ func (b *reg) ListSupportedMimeTypes(ctx context.Context) (map[string]*registryp
 
 	mimeTypes := make(map[string]*registrypb.AppProviderList)
 	for _, p := range b.providers {
+		t := *p
+		t.MimeTypes = nil
 		for _, m := range p.MimeTypes {
 			if _, ok := mimeTypes[m]; ok {
-				mimeTypes[m].AppProviders = append(mimeTypes[m].AppProviders, p)
+				mimeTypes[m].AppProviders = append(mimeTypes[m].AppProviders, &t)
 			} else {
-				mimeTypes[m] = &registrypb.AppProviderList{AppProviders: []*registrypb.ProviderInfo{p}}
+				mimeTypes[m] = &registrypb.AppProviderList{AppProviders: []*registrypb.ProviderInfo{&t}}
 			}
 		}
 	}