Do not use for now a shared map.

TODO for a future PR: refresh the map of apps URLs every day or week,
and cache it at the service level (protected by a multi-reader Lock).

docs/content/en/docs/config/grpc/services/appprovider/_index.md

@@ -9,15 +9,15 @@ description: >
 # _struct: config_
 
 {{% dir name="iopsecret" type="string" default="" %}}
-The iopsecret used to connect to the wopiserver. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/appprovider/appprovider.go#L60)
+The iopsecret used to connect to the wopiserver. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/appprovider/appprovider.go#L59)
 {{< highlight toml >}}
 [grpc.services.appprovider]
 iopsecret = ""
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="wopiurl" type="string" default="" %}}
-The wopiserver's URL. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/appprovider/appprovider.go#L61)
+The wopiserver's URL. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/appprovider/appprovider.go#L60)
 {{< highlight toml >}}
 [grpc.services.appprovider]
 wopiurl = ""

internal/grpc/services/appprovider/appprovider.go

@@ -49,9 +49,8 @@ func init() {
 }
 
 type service struct {
-	provider   app.Provider
-	conf       *config
-	appsURLMap map[string]interface{}
+	provider app.Provider
+	conf     *config
 }
 
 type config struct {
@@ -111,7 +110,7 @@ func getProvider(c *config) (app.Provider, error) {
 	}
 }
 
-func (s *service) getWopiAppEndpoints(ctx context.Context) error {
+func (s *service) getWopiAppEndpoints(ctx context.Context) (map[string]interface{}, error) {
 	httpClient := rhttp.GetHTTPClient(
 		rhttp.Context(ctx),
 		// calls to WOPI are expected to take a very short time, 5s (though hardcoded) ought to be far enough
@@ -122,52 +121,41 @@ func (s *service) getWopiAppEndpoints(ctx context.Context) error {
 	// For the time being it is a remnant of the CERNBox-specific WOPI server, which justifies the /cbox path in the URL.
 	wopiurl, err := url.Parse(s.conf.WopiURL)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	wopiurl.Path = path.Join(wopiurl.Path, "/wopi/cbox/endpoints")
 	appsReq, err := rhttp.NewRequest(ctx, "GET", wopiurl.String(), nil)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	appsRes, err := httpClient.Do(appsReq)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer appsRes.Body.Close()
 	if appsRes.StatusCode != http.StatusOK {
-		return errors.New("Request to WOPI server returned " + string(appsRes.StatusCode))
+		return nil, errors.New("Request to WOPI server returned " + string(appsRes.StatusCode))
 	}
 	appsBody, err := ioutil.ReadAll(appsRes.Body)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	s.appsURLMap = make(map[string]interface{})
-	err = json.Unmarshal(appsBody, &s.appsURLMap)
+	appsURLMap := make(map[string]interface{})
+	err = json.Unmarshal(appsBody, &appsURLMap)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	log := appctx.GetLogger(ctx)
-	log.Info().Msg(fmt.Sprintf("Successfully retrieved %d WOPI app endpoints", len(s.appsURLMap)))
-	return nil
+	log.Info().Msg(fmt.Sprintf("Successfully retrieved %d WOPI app endpoints", len(appsURLMap)))
+	return appsURLMap, nil
 }
 
 func (s *service) OpenFileInAppProvider(ctx context.Context, req *providerpb.OpenFileInAppProviderRequest) (*providerpb.OpenFileInAppProviderResponse, error) {
 
 	log := appctx.GetLogger(ctx)
 
-	if s.appsURLMap == nil {
-		// TODO refresh after e.g. a day or a week
-		err := s.getWopiAppEndpoints(ctx)
-		if err != nil {
-			res := &providerpb.OpenFileInAppProviderResponse{
-				Status: status.NewInternal(ctx, err, "appprovider: getWopiAppEndpoints failed"),
-			}
-			return res, nil
-		}
-	}
-
 	httpClient := rhttp.GetHTTPClient(
 		rhttp.Context(ctx),
 		// calls to WOPI are expected to take a very short time, 5s (though hardcoded) ought to be far enough
@@ -225,7 +213,15 @@ func (s *service) OpenFileInAppProvider(ctx context.Context, req *providerpb.Ope
 	}
 	openResBody := buf.String()
 
-	viewOptions := s.appsURLMap[path.Ext(req.ResourceInfo.GetPath())]
+	// TODO call this e.g. once a day or a week, and cache the content in a shared map protected by a multi-reader Lock
+	appsURLMap, err := s.getWopiAppEndpoints(ctx)
+	if err != nil {
+		res := &providerpb.OpenFileInAppProviderResponse{
+			Status: status.NewInternal(ctx, err, "appprovider: getWopiAppEndpoints failed"),
+		}
+		return res, nil
+	}
+	viewOptions := appsURLMap[path.Ext(req.ResourceInfo.GetPath())]
 	viewOptionsMap, ok := viewOptions.(map[string]interface{})
 	if !ok {
 		res := &providerpb.OpenFileInAppProviderResponse{