Scaffold identity server

dev/up

@@ -8,7 +8,7 @@ if ! which golangci-lint &>/dev/null; then brew install golangci-lint; fi
 if ! which shellcheck &>/dev/null; then brew install shellcheck; fi
 if ! which protoc &>/dev/null; then brew install protobuf; fi
 if ! which protoc-gen-go &>/dev/null; then go install google.golang.org/protobuf/cmd/protoc-gen-go@latest; fi
-if ! which mockgen &>/dev/null; then go install go.uber.org/mock/mockgen@latest; fi
+go install go.uber.org/mock/mockgen@latest
 if ! which protolint &>/dev/null; then go install github.com/yoheimuta/protolint/cmd/protolint@latest; fi
 
 dev/generate

go.mod

@@ -75,7 +75,7 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.0.0 // indirect
-	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/gopacket v1.1.19 // indirect

pkg/api/server.go

@@ -17,6 +17,7 @@ import (
 	swgui "github.com/swaggest/swgui/v3"
 	wakupb "github.com/waku-org/go-waku/waku/v2/protocol/pb"
 	wakurelay "github.com/waku-org/go-waku/waku/v2/protocol/relay"
+	identityv1pb "github.com/xmtp/xmtp-node-go/pkg/proto/identity/api/v1"
 	proto "github.com/xmtp/xmtp-node-go/pkg/proto/message_api/v1"
 	mlsv1pb "github.com/xmtp/xmtp-node-go/pkg/proto/mls/api/v1"
 	messagev1openapi "github.com/xmtp/xmtp-node-go/pkg/proto/openapi"
@@ -33,6 +34,7 @@ import (
 	"github.com/pires/go-proxyproto"
 	messagev1 "github.com/xmtp/xmtp-node-go/pkg/api/message/v1"
 	apicontext "github.com/xmtp/xmtp-node-go/pkg/api/message/v1/context"
+	identityv1 "github.com/xmtp/xmtp-node-go/pkg/identity/api/v1"
 	mlsv1 "github.com/xmtp/xmtp-node-go/pkg/mls/api/v1"
 )
 
@@ -51,6 +53,7 @@ type Server struct {
 	httpListener net.Listener
 	messagev1    *messagev1.Service
 	mlsv1        *mlsv1.Service
+	identityv1   *identityv1.Service
 	wg           sync.WaitGroup
 	ctx          context.Context
 	ctxCancel    func()
@@ -155,13 +158,19 @@ func (s *Server) startGRPC() error {
 	}
 	proto.RegisterMessageApiServer(grpcServer, s.messagev1)
 
-	// Enable the MLS server if a store is provided
+	// Enable the MLS and identity servers if a store is provided
 	if s.Config.MLSStore != nil && s.Config.MLSValidator != nil && s.Config.EnableMls {
 		s.mlsv1, err = mlsv1.NewService(s.Log, s.Config.MLSStore, s.Config.MLSValidator, s.natsServer, publishToWakuRelay)
 		if err != nil {
 			return errors.Wrap(err, "creating mls service")
 		}
 		mlsv1pb.RegisterMlsApiServer(grpcServer, s.mlsv1)
+
+		s.identityv1, err = identityv1.NewService(s.Log, s.Config.MLSStore)
+		if err != nil {
+			return errors.Wrap(err, "creating identity service")
+		}
+		identityv1pb.RegisterIdentityApiServer(grpcServer, s.identityv1)
 	}
 
 	// Initialize waku relay subscription.
@@ -251,6 +260,11 @@ func (s *Server) startHTTP() error {
 		if err != nil {
 			return errors.Wrap(err, "registering mls handler")
 		}
+
+		err = identityv1pb.RegisterIdentityApiHandler(s.ctx, gwmux, conn)
+		if err != nil {
+			return errors.Wrap(err, "registering identity handler")
+		}
 	}
 
 	addr := addrString(s.HTTPAddress, s.HTTPPort)

pkg/identity/api/v1/service.go

@@ -0,0 +1,54 @@
+package api
+
+import (
+	"context"
+
+	mlsstore "github.com/xmtp/xmtp-node-go/pkg/mls/store"
+	api "github.com/xmtp/xmtp-node-go/pkg/proto/identity/api/v1"
+	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type Service struct {
+	api.UnimplementedIdentityApiServer
+
+	log   *zap.Logger
+	store mlsstore.MlsStore
+
+	ctx       context.Context
+	ctxCancel func()
+}
+
+func NewService(log *zap.Logger, store mlsstore.MlsStore) (s *Service, err error) {
+	s = &Service{
+		log:   log.Named("identity"),
+		store: store,
+	}
+	s.ctx, s.ctxCancel = context.WithCancel(context.Background())
+
+	s.log.Info("Starting identity service")
+	return s, nil
+}
+
+func (s *Service) Close() {
+	s.log.Info("closing")
+
+	if s.ctxCancel != nil {
+		s.ctxCancel()
+	}
+
+	s.log.Info("closed")
+}
+
+func (s *Service) PublishIdentityUpdate(ctx context.Context, req *api.PublishIdentityUpdateRequest) (*api.PublishIdentityUpdateResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "unimplemented")
+}
+
+func (s *Service) GetIdentityUpdates(ctx context.Context, req *api.GetIdentityUpdatesRequest) (*api.GetIdentityUpdatesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "unimplemented")
+}
+
+func (s *Service) GetInboxIds(ctx context.Context, req *api.GetInboxIdsRequest) (*api.GetInboxIdsResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "unimplemented")
+}