From 6e7b396606fffd875dbf09cef57f1601bb03cfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Tue, 11 Oct 2022 11:19:39 +0200 Subject: [PATCH] Get rid of superfluous GetUserByClaim call --- .../pkg/search/provider/searchprovider.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/services/search/pkg/search/provider/searchprovider.go b/services/search/pkg/search/provider/searchprovider.go index ac83db3f5e4..1d5732d897d 100644 --- a/services/search/pkg/search/provider/searchprovider.go +++ b/services/search/pkg/search/provider/searchprovider.go @@ -256,21 +256,9 @@ func (p *Provider) IndexSpace(ctx context.Context, req *searchsvc.IndexSpaceRequ } func (p *Provider) doIndexSpace(ctx context.Context, spaceID *provider.StorageSpaceId, userID *user.UserId) error { - // get user - res, err := p.gwClient.GetUserByClaim(ctx, &user.GetUserByClaimRequest{ - Claim: "userid", - Value: userID.OpaqueId, - }) - if err != nil || res.Status.Code != rpc.Code_CODE_OK { - fmt.Println("error: Could not get user by userid") - return err - } - - // Get auth context - ownerCtx := ctxpkg.ContextSetUser(ctx, res.User) - authRes, err := p.gwClient.Authenticate(ownerCtx, &gateway.AuthenticateRequest{ + authRes, err := p.gwClient.Authenticate(ctx, &gateway.AuthenticateRequest{ Type: "machine", - ClientId: "userid:" + res.User.Id.OpaqueId, + ClientId: "userid:" + userID.OpaqueId, ClientSecret: p.machineAuthAPIKey, }) if err != nil || authRes.GetStatus().GetCode() != rpc.Code_CODE_OK { @@ -280,7 +268,7 @@ func (p *Provider) doIndexSpace(ctx context.Context, spaceID *provider.StorageSp if authRes.GetStatus().GetCode() != rpc.Code_CODE_OK { return fmt.Errorf("could not get authenticated context for user") } - ownerCtx = metadata.AppendToOutgoingContext(ownerCtx, ctxpkg.TokenHeader, authRes.Token) + ownerCtx := metadata.AppendToOutgoingContext(ctx, ctxpkg.TokenHeader, authRes.Token) // Walk the space and index all files walker := walker.NewWalker(p.gwClient)