Skip to content

Commit

Permalink
List OCM providers (#3667)
Browse files Browse the repository at this point in the history
  • Loading branch information
gmgigi96 authored Feb 21, 2023
1 parent 145ab51 commit 3e919cc
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 0 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/ocm-list-providers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Enhancement: List OCM providers

Adds the endpoint `/list-providers` in the sciencemesh service,
to get a filtered list of the OCM providers.
The filter can be specified with the `search` query parameters,
and filters by domain and full name of the provider.

https://github.com/cs3org/reva/pull/3667
87 changes: 87 additions & 0 deletions internal/http/services/sciencemesh/providers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Copyright 2018-2023 CERN
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// In applying this license, CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

package sciencemesh

import (
"encoding/json"
"errors"
"net/http"
"strings"

gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
providerpb "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
"github.com/cs3org/reva/internal/http/services/reqres"
"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
)

type providersHandler struct {
gatewayClient gateway.GatewayAPIClient
}

func (h *providersHandler) init(c *config) error {
var err error
h.gatewayClient, err = pool.GetGatewayServiceClient(pool.Endpoint(c.GatewaySvc))
if err != nil {
return err
}

return nil
}

type provider struct {
FullName string `json:"full_name"`
Domain string `json:"domain"`
}

// ListProviders lists all the providers filtering by the `search` query parameter.
func (h *providersHandler) ListProviders(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
term := strings.ToLower(r.URL.Query().Get("search"))

listRes, err := h.gatewayClient.ListAllProviders(ctx, &providerpb.ListAllProvidersRequest{})
if err != nil {
reqres.WriteError(w, r, reqres.APIErrorServerError, "error listing all providers", err)
return
}

if listRes.Status.Code != rpc.Code_CODE_OK {
reqres.WriteError(w, r, reqres.APIErrorServerError, listRes.Status.Message, errors.New(listRes.Status.Message))
return
}

filtered := []*provider{}
for _, p := range listRes.Providers {
if strings.Contains(strings.ToLower(p.FullName), term) ||
strings.Contains(strings.ToLower(p.Domain), term) {
filtered = append(filtered, &provider{
FullName: p.FullName,
Domain: p.Domain,
})
}
}

if err := json.NewEncoder(w).Encode(filtered); err != nil {
reqres.WriteError(w, r, reqres.APIErrorServerError, "error encoding response in json", err)
return
}

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
}
5 changes: 5 additions & 0 deletions internal/http/services/sciencemesh/sciencemesh.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,16 @@ func (s *svc) routerInit() error {
if err := tokenHandler.init(s.conf); err != nil {
return err
}
providersHandler := new(providersHandler)
if err := providersHandler.init(s.conf); err != nil {
return err
}

s.router.Get("/generate-invite", tokenHandler.Generate)
s.router.Get("/list-invite", tokenHandler.ListInvite)
s.router.Post("/accept-invite", tokenHandler.AcceptInvite)
s.router.Get("/find-accepted-users", tokenHandler.FindAccepted)
s.router.Get("/list-providers", providersHandler.ListProviders)

return nil
}
Expand Down

0 comments on commit 3e919cc

Please sign in to comment.