SetAssociatedAccounts, DisassociateAccounts, AssociateAccounts with support for multiple accounts. (#439)

This commit is contained in:
Jim authored and GitHub committed 2020-09-25 13:35:32 -04:00
1 parent 0d75d591d1
commit 21ca0b6388
11 files changed
+1189 -215

No files matched your search

@@ -138,7 +138,7 @@ func (s Service) getFromRepo(ctx context.Context, id string) (*pb.User, error) {
if err != nil {
return nil, err
}
u, err := repo.LookupUser(ctx, id)
u, _, err := repo.LookupUser(ctx, id)
if err != nil {
if errors.Is(err, db.ErrRecordNotFound) {
return nil, handlers.NotFoundErrorf("User %q doesn't exist.", id)
@@ -199,7 +199,7 @@ func (s Service) updateInRepo(ctx context.Context, orgId, id string, mask []stri
if err != nil {
return nil, err
}
out, rowsUpdated, err := repo.UpdateUser(ctx, u, version, dbMask)
out, _, rowsUpdated, err := repo.UpdateUser(ctx, u, version, dbMask)
if err != nil {
return nil, status.Errorf(codes.Internal, "Unable to update user: %v.", err)
}
@@ -263,7 +263,7 @@ func (s Service) authResult(ctx context.Context, id string, a action.Type) auth.
return res
}
default:
u, err := repo.LookupUser(ctx, id)
u, _, err := repo.LookupUser(ctx, id)
if err != nil {
res.Error = err
return res
@@ -356,7 +356,7 @@ func TestUpdate(t *testing.T) {
repo, err := repoFn()
require.NoError(t, err, "Couldn't get a new repo")
version++ // From the test case that resulted in calling this
u, _, err = repo.UpdateUser(context.Background(), u, version, []string{"Name", "Description"})
u, _, _, err = repo.UpdateUser(context.Background(), u, version, []string{"Name", "Description"})
require.NoError(t, err, "Failed to reset the user")
version++
}