New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Invite manager "api" for use with NC/OC-10 #3967

Closed

michielbdejong wants to merge 9 commits into cs3org:master from pondersource:mrv/nvite-api-provider

Contributor

michielbdejong commented Jun 13, 2023

With this invite manager, OCM invites (both pending and accepted) will be stored in your EFSS instead of inside the revad server in a /var/tmp/reva/ocm-invites.json file which is the current standard behaviour for NC/OC-10 based ScienceMesh sites.

mrvahedi68 and others added 9 commits

May 5, 2023 11:23


          add new invite driver to store data to an external repository using i…

718150d

…t's api

Signed-off-by: MohammadReza vahedi <[email protected]>


          add to loader

dc077a9

Signed-off-by: MohammadReza vahedi <[email protected]>


          bugfixes and change in the json mappings

Signed-off-by: MohammadReza vahedi <[email protected]>


          add new invite driver to store data to an external repository using i…

87a2d0c

…t's api

Signed-off-by: MohammadReza vahedi <[email protected]>


          add to loader

eefff99

Signed-off-by: MohammadReza vahedi <[email protected]>


          bugfixes and change in the json mappings

8551de4

Signed-off-by: MohammadReza vahedi <[email protected]>


          rebase with master

Signed-off-by: MohammadReza vahedi <[email protected]>


          fix breaking changes

6e627b4

Signed-off-by: MohammadReza vahedi <[email protected]>


          test finalize and bugfixing

18b3aa9

Signed-off-by: MohammadReza vahedi <[email protected]>

michielbdejong requested review from labkode, gmgigi96, glpatcern and a team as code owners

June 13, 2023 07:38

hound bot reviewed

View reviewed changes

pkg/ocm/invite/repository/api/api.go

+              	return it, nil
+              }
+              func (c *Client) ListTokens(ctx context.Context, initiator *userpb.UserId) ([]*invitepb.InviteToken, error) {

hound bot Jun 13, 2023

exported method Client.ListTokens should have comment or be unexported

pkg/ocm/invite/repository/api/api.go

+              }
+              func (c *Client) doGetAllRemoteUsers(initiator string, search string) ([]*apiOCMUser, error) {
+              	requestUrl := c.Config.BaseURL + "/api/v1/find_remote_user/" + initiator + "?search=" + search

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              }
+              func (c *Client) doGetRemoteUser(initiator string, opaque_user_id string, idp string) (*apiOCMUser, error) {
+              	requestUrl := c.Config.BaseURL + "/api/v1/get_remote_user/" + initiator + "?userId=" + opaque_user_id + "&idp=" + idp

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              	return true, nil
+              }
+              func (c *Client) doGetRemoteUser(initiator string, opaque_user_id string, idp string) (*apiOCMUser, error) {

hound bot Jun 13, 2023

don't use underscores in Go names; method parameter opaque_user_id should be opaqueUserID

pkg/ocm/invite/repository/api/api.go

+              	if err != nil {
+              		return false, err
+              	}
+              	requestUrl := c.Config.BaseURL + "/api/v1/add_remote_user/" + initiator

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              	return result, nil
+              }
+              func (c *Client) doPostRemoteUser(initiator string, opaque_user_id string, idp string, email string, display_name string) (bool, error) {

hound bot Jun 13, 2023

don't use underscores in Go names; method parameter display_name should be displayName
don't use underscores in Go names; method parameter opaque_user_id should be opaqueUserID

pkg/ocm/invite/repository/api/api.go

+              }
+              func (c *Client) doGetAllTokens(initiator string) ([]*apiToken, error) {
+              	requestUrl := c.Config.BaseURL + "/api/v1/tokens_list/" + initiator

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              }
+              func (c *Client) doGetToken(token string) (*apiToken, error) {
+              	requestUrl := c.Config.BaseURL + "/api/v1/get_token"  + "?token=" + token

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              		return false, err
+              	}
+              	requestUrl := c.Config.BaseURL + "/api/v1/add_token/" + initiator

hound bot Jun 13, 2023

var requestUrl should be requestURL

pkg/ocm/invite/repository/api/api.go

+              type config struct {
+              	BaseURL string `mapstructure:"base_url"`
+              	ApiKey string `mapstructure:"api_key"`

hound bot Jun 13, 2023

struct field ApiKey should be APIKey

Member

gmgigi96 commented Jun 13, 2023

Maybe "api" as name is too generic? I would call it "nextcloud" or "owncloud", like in the ocm share provider

Contributor Author

michielbdejong commented Jun 13, 2023 •

edited

Loading

@mrvahedi68 can you resolve the Hound smells and answer the reviewer comment above?

Also, I'm seeing this in the mesh.pondersource.org logs:

2023-06-13 10:41:21.076 ERR ../reva/cmd/revad/runtime/runtime.go:219 > error starting the grpc server error="unable to register services: rgrpc: grpc service ocminvitemanager could not be started,: failed to build resolver: passthrough: received empty target in Build()" pid=292622

do you know what might cause that?
This is my config:

[grpc.services.ocminvitemanager]
driver = "api"
provider_domain = "mesh.pondersource.org"

[grpc.services.ocminvitemanager.drivers.api]
base_url = "https://cloud.pondersource.org/"
api_key = "shared-secret-1"

mrvahedi68 commented Jun 13, 2023

@mrvahedi68 can you resolve the Hound smells and answer the reviewer comment above?

Also, I'm seeing this in the mesh.pondersource.org logs:

2023-06-13 10:41:21.076 ERR ../reva/cmd/revad/runtime/runtime.go:219 > error starting the grpc server error="unable to register services: rgrpc: grpc service ocminvitemanager could not be started,: failed to build resolver: passthrough: received empty target in Build()" pid=292622

do you know what might cause that? This is my config:

[grpc.services.ocminvitemanager]
driver = "api"
provider_domain = "mesh.pondersource.org"

[grpc.services.ocminvitemanager.drivers.api]
base_url = "https://cloud.pondersource.org/"
api_key = "shared-secret-1"

It is for missing gatewaysvc configuration inside api configuration section.
Like this:
[grpc.services.ocminvitemanager.drivers.api] base_url = "https://cloud.pondersource.org/" api_key = "shared-secret-1" gatewaysvc = "Put Here"

glpatcern mentioned this pull request

All required features and fixes for the OC/NC ScienceMesh apps #4115

Merged

21 tasks

Member

glpatcern commented Aug 15, 2023

Superseded by #4115

glpatcern closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet