pass client context in rpc

Signed-off-by: Jimil Desai <jimildesai42@gmail.com>
cs3org · Aug 3, 2021 · 5584e55 · 5584e55
1 parent 9abb46e
commit 5584e55
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/pkg/user/rpc_user.go b/pkg/user/rpc_user.go
@@ -72,6 +72,7 @@ func (m *RPCClient) Configure(ml map[string]interface{}) error {
 
 // GetUserArg for RPC
 type GetUserArg struct {
+	Ctx context.Context
 	UID *userpb.UserId
 }
 
@@ -83,7 +84,7 @@ type GetUserReply struct {
 
 // GetUser RPCClient GetUser method
 func (m *RPCClient) GetUser(ctx context.Context, uid *userpb.UserId) (*userpb.User, error) {
-	args := GetUserArg{UID: uid}
+	args := GetUserArg{UID: uid, Ctx: ctx}
 	resp := GetUserReply{}
 	err := m.Client.Call("Plugin.GetUser", args, &resp)
 	if err != nil {
@@ -94,6 +95,7 @@ func (m *RPCClient) GetUser(ctx context.Context, uid *userpb.UserId) (*userpb.Us
 
 // GetUserByClaimArg for RPC
 type GetUserByClaimArg struct {
+	Ctx   context.Context
 	Claim string
 	Value string
 }
@@ -106,7 +108,7 @@ type GetUserByClaimReply struct {
 
 // GetUserByClaim RPCClient GetUserByClaim method
 func (m *RPCClient) GetUserByClaim(ctx context.Context, claim, value string) (*userpb.User, error) {
-	args := GetUserByClaimArg{Claim: claim, Value: value}
+	args := GetUserByClaimArg{Ctx: ctx, Claim: claim, Value: value}
 	resp := GetUserByClaimReply{}
 	err := m.Client.Call("Plugin.GetUserByClaim", args, &resp)
 	if err != nil {
@@ -117,6 +119,7 @@ func (m *RPCClient) GetUserByClaim(ctx context.Context, claim, value string) (*u
 
 // GetUserGroupsArg for RPC
 type GetUserGroupsArg struct {
+	Ctx  context.Context
 	User *userpb.UserId
 }
 
@@ -128,7 +131,7 @@ type GetUserGroupsReply struct {
 
 // GetUserGroups RPCClient GetUserGroups method
 func (m *RPCClient) GetUserGroups(ctx context.Context, user *userpb.UserId) ([]string, error) {
-	args := GetUserGroupsArg{User: user}
+	args := GetUserGroupsArg{Ctx: ctx, User: user}
 	resp := GetUserGroupsReply{}
 	err := m.Client.Call("Plugin.GetUserGroups", args, &resp)
 	if err != nil {
@@ -139,6 +142,7 @@ func (m *RPCClient) GetUserGroups(ctx context.Context, user *userpb.UserId) ([]s
 
 // FindUsersArg for RPC
 type FindUsersArg struct {
+	Ctx   context.Context
 	Query string
 }
 
@@ -150,7 +154,7 @@ type FindUsersReply struct {
 
 // FindUsers RPCClient FindUsers method
 func (m *RPCClient) FindUsers(ctx context.Context, query string) ([]*userpb.User, error) {
-	args := FindUsersArg{Query: query}
+	args := FindUsersArg{Ctx: ctx, Query: query}
 	resp := FindUsersReply{}
 	err := m.Client.Call("Plugin.FindUsers", args, &resp)
 	if err != nil {
@@ -173,24 +177,24 @@ func (m *RPCServer) Configure(args ConfigureArg, resp *ConfigureReply) error {
 
 // GetUser RPCServer GetUser method
 func (m *RPCServer) GetUser(args GetUserArg, resp *GetUserReply) error {
-	resp.User, resp.Err = m.Impl.GetUser(context.Background(), args.UID)
+	resp.User, resp.Err = m.Impl.GetUser(args.Ctx, args.UID)
 	return nil
 }
 
 // GetUserByClaim RPCServer GetUserByClaim method
 func (m *RPCServer) GetUserByClaim(args GetUserByClaimArg, resp *GetUserByClaimReply) error {
-	resp.User, resp.Err = m.Impl.GetUserByClaim(context.Background(), args.Claim, args.Value)
+	resp.User, resp.Err = m.Impl.GetUserByClaim(args.Ctx, args.Claim, args.Value)
 	return nil
 }
 
 // GetUserGroups RPCServer GetUserGroups method
 func (m *RPCServer) GetUserGroups(args GetUserGroupsArg, resp *GetUserGroupsReply) error {
-	resp.Group, resp.Err = m.Impl.GetUserGroups(context.Background(), args.User)
+	resp.Group, resp.Err = m.Impl.GetUserGroups(args.Ctx, args.User)
 	return nil
 }
 
 // FindUsers RPCServer FindUsers method
 func (m *RPCServer) FindUsers(args FindUsersArg, resp *FindUsersReply) error {
-	resp.User, resp.Err = m.Impl.FindUsers(context.Background(), args.Query)
+	resp.User, resp.Err = m.Impl.FindUsers(args.Ctx, args.Query)
 	return nil
 }