Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Add ability for users to delete their acounts with their data #322
Acho Arnold2ff18973813a
diff --git a/api/cmd/experiments/main.go b/api/cmd/experiments/main.goindex 1d3873f1..196a0a65 100644--- a/api/cmd/experiments/main.go+++ b/api/cmd/experiments/main.go@@ -34,7 +34,6 @@ func main() {logger := container.Logger()logger.Info("Starting experiments")- deleteContacts(container)}func chunkBy[T any](items []T, chunkSize int) (chunks [][]T) {diff --git a/api/go.mod b/api/go.modindex bcb69315..1eef08e4 100644--- a/api/go.mod+++ b/api/go.mod@@ -49,7 +49,6 @@ require (go.opentelemetry.io/otel/trace v1.31.0google.golang.org/api v0.200.0google.golang.org/protobuf v1.35.1- gorm.io/datatypes v1.2.4gorm.io/driver/postgres v1.5.7gorm.io/gorm v1.25.12gorm.io/plugin/opentelemetry v0.1.8@@ -66,7 +65,6 @@ require (cloud.google.com/go/monitoring v1.21.1 // indirectcloud.google.com/go/storage v1.43.0 // indirectcloud.google.com/go/trace v1.11.1 // indirect- filippo.io/edwards25519 v1.1.0 // indirectgithub.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirectgithub.com/KyleBanks/depth v1.2.1 // indirectgithub.com/Masterminds/goutils v1.1.1 // indirect@@ -85,7 +83,6 @@ require (github.com/go-openapi/jsonreference v0.21.0 // indirectgithub.com/go-openapi/spec v0.21.0 // indirectgithub.com/go-openapi/swag v0.23.0 // indirect- github.com/go-sql-driver/mysql v1.8.1 // indirectgithub.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirectgithub.com/golang/protobuf v1.5.4 // indirectgithub.com/google/s2a-go v0.1.8 // indirect@@ -160,5 +157,4 @@ require (google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirectgoogle.golang.org/grpc v1.67.1 // indirectgopkg.in/yaml.v3 v3.0.1 // indirect- gorm.io/driver/mysql v1.5.6 // indirect)diff --git a/api/go.sum b/api/go.sumindex 5084e4e8..21dea7f1 100644--- a/api/go.sum+++ b/api/go.sum@@ -25,8 +25,6 @@ cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXcloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew=cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA=-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4=firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs=github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=@@ -116,9 +114,6 @@ github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9Zgithub.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=github.com/gofiber/contrib/otelfiber v1.0.10 h1:Bu28Pi4pfYmGfIc/9+sNaBbFwTHGY/zpSIK5jBxuRtM=github.com/gofiber/contrib/otelfiber v1.0.10/go.mod h1:jN6AvS1HolDHTQHFURsV+7jSX96FpXYeKH6nmkq8AIw=@@ -130,10 +125,6 @@ github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=-github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=-github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=-github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=-github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=@@ -245,8 +236,6 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgithub.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=-github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE=-github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ=github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=@@ -528,17 +517,10 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=-gorm.io/datatypes v1.2.4 h1:uZmGAcK/QZ0uyfCuVg0VQY1ZmV9h1fuG0tMwKByO1z4=-gorm.io/datatypes v1.2.4/go.mod h1:f4BsLcFAX67szSv8svwLRjklArSHAvHLeE3pXAS5DZI=-gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=-gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM=gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=gorm.io/driver/sqlite v1.5.0 h1:zKYbzRCpBrT1bNijRnxLDJWPjVfImGEn0lSnUY5gZ+c=gorm.io/driver/sqlite v1.5.0/go.mod h1:kDMDfntV9u/vuMmz8APHtHF0b4nyBB7sfCieC6G8k8I=-gorm.io/driver/sqlserver v1.4.1 h1:t4r4r6Jam5E6ejqP7N82qAJIJAht27EGT41HyPfXRw0=-gorm.io/driver/sqlserver v1.4.1/go.mod h1:DJ4P+MeZbc5rvY58PnmN1Lnyvb5gw5NPzGshHDnJLig=-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=gorm.io/plugin/opentelemetry v0.1.8 h1:uX3deb3w71mufbx8iY9buiGh+4HJjhItRNisZIy1fDY=diff --git a/api/pkg/di/container.go b/api/pkg/di/container.goindex d6252bf9..5ca15e38 100644--- a/api/pkg/di/container.go+++ b/api/pkg/di/container.go@@ -696,16 +696,6 @@ func (container *Container) MessageThreadRepository() (repository repositories.M)}-// EventRepository creates a new instance of repositories.EventRepository-func (container *Container) EventRepository() (repository repositories.EventRepository) {- container.logger.Debug("creating GORM repositories.EventRepository")- return repositories.NewGormEventRepository(- container.Logger(),- container.Tracer(),- container.DB(),- )-}-// HeartbeatMonitorRepository creates a new instance of repositories.HeartbeatMonitorRepositoryfunc (container *Container) HeartbeatMonitorRepository() (repository repositories.HeartbeatMonitorRepository) {container.logger.Debug("creating GORM repositories.HeartbeatMonitorRepository")@@ -716,16 +706,6 @@ func (container *Container) HeartbeatMonitorRepository() (repository repositorie)}-// EventListenerLogRepository creates a new instance of repositories.EventListenerLogRepository-func (container *Container) EventListenerLogRepository() (repository repositories.EventListenerLogRepository) {- container.logger.Debug("creating GORM repositories.EventListenerLogRepository")- return repositories.NewGormEventListenerLogRepository(- container.Logger(),- container.Tracer(),- container.DB(),- )-}-// HeartbeatService creates a new instance of services.HeartbeatServicefunc (container *Container) HeartbeatService() (service *services.HeartbeatService) {container.logger.Debug(fmt.Sprintf("creating %T", service))@@ -861,6 +841,7 @@ func (container *Container) UserService() (service *services.UserService) {container.MarketingService(),container.LemonsqueezyClient(),container.EventDispatcher(),+ container.FirebaseAuthClient(),)}diff --git a/api/pkg/entities/user.go b/api/pkg/entities/user.goindex e3167465..aff66c53 100644--- a/api/pkg/entities/user.go+++ b/api/pkg/entities/user.go@@ -9,6 +9,11 @@ import (// UserID is the ID of a usertype UserID string+// String returns the string representation of a UserID+func (id UserID) String() string {+ return string(id)+}+// SubscriptionName is the name of the subscriptiontype SubscriptionName stringdiff --git a/api/pkg/events/user_account_deleted_event.go b/api/pkg/events/user_account_deleted_event.gonew file mode 100644index 00000000..581b44ef--- /dev/null+++ b/api/pkg/events/user_account_deleted_event.go@@ -0,0 +1,16 @@+package events++import (+ "time"++ "github.com/NdoleStudio/httpsms/pkg/entities"+)++// UserAccountDeleted is raised when a user's account is deleted.+const UserAccountDeleted = "user.account.deleted"++// UserAccountDeletedPayload stores the data for the UserAccountDeletedPayload event+type UserAccountDeletedPayload struct {+ UserID entities.UserID `json:"user_id"`+ Timestamp time.Time `json:"timestamp"`+}diff --git a/api/pkg/handlers/user_handler.go b/api/pkg/handlers/user_handler.goindex 66ef19e0..daa0aaab 100644--- a/api/pkg/handlers/user_handler.go+++ b/api/pkg/handlers/user_handler.go@@ -41,6 +41,7 @@ func NewUserHandler(func (h *UserHandler) RegisterRoutes(router fiber.Router) {router.Get("/users/me", h.Show)router.Put("/users/me", h.Update)+ router.Delete("/users/me", h.Delete)router.Delete("/users/:userID/api-keys", h.DeleteAPIKey)router.Put("/users/:userID/notifications", h.UpdateNotifications)router.Get("/users/subscription-update-url", h.subscriptionUpdateURL)@@ -121,6 +122,30 @@ func (h *UserHandler) Update(c *fiber.Ctx) error {return h.responseOK(c, "user updated successfully", user)}+// Delete an entities.User+// @Summary Delete a user+// @Description Deletes the currently authenticated user together with all their data.+// @Security ApiKeyAuth+// @Tags Users+// @Accept json+// @Produce json+// @Success 201 {object} responses.NoContent+// @Failure 401 {object} responses.Unauthorized+// @Failure 500 {object} responses.InternalServerError+// @Router /users/me [delete]+func (h *UserHandler) Delete(c *fiber.Ctx) error {+ ctx, span, ctxLogger := h.tracer.StartFromFiberCtxWithLogger(c, h.logger)+ defer span.End()++ if err := h.service.Delete(ctx, c.OriginalURL(), h.userIDFomContext(c)); err != nil {+ msg := fmt.Sprintf("cannot delete user user with ID [%s]", h.userIDFomContext(c))+ ctxLogger.Error(stacktrace.Propagate(err, msg))+ return h.responseInternalServerError(c)+ }++ return h.responseNoContent(c, "user deleted successfully")+}+// UpdateNotifications an entities.User// @Summary Update notification settings// @Description Update the email notification settings for a userdiff --git a/api/pkg/listeners/billing_listener.go b/api/pkg/listeners/billing_listener.goindex 67871a15..7e2cce00 100644--- a/api/pkg/listeners/billing_listener.go+++ b/api/pkg/listeners/billing_listener.go@@ -34,6 +34,7 @@ func NewBillingListener(return l, map[string]events.EventListener{events.EventTypeMessageAPISent: l.OnMessageAPISent,+ events.UserAccountDeleted: l.onUserAccountDeleted,events.EventTypeMessagePhoneReceived: l.OnMessagePhoneReceived,}}@@ -75,3 +76,21 @@ func (listener *BillingListener) OnMessagePhoneReceived(ctx context.Context, evereturn nil}++func (listener *BillingListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.BillingUsage] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/discord_listener.go b/api/pkg/listeners/discord_listener.goindex 89d30b03..b590edcd 100644--- a/api/pkg/listeners/discord_listener.go+++ b/api/pkg/listeners/discord_listener.go@@ -32,6 +32,7 @@ func NewDiscordListener(return l, map[string]events.EventListener{events.EventTypeMessagePhoneReceived: l.OnMessagePhoneReceived,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -53,3 +54,21 @@ func (listener *DiscordListener) OnMessagePhoneReceived(ctx context.Context, evereturn nil}++func (listener *DiscordListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Discord] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/heartbeat_listener.go b/api/pkg/listeners/heartbeat_listener.goindex f522ae2e..573a029b 100644--- a/api/pkg/listeners/heartbeat_listener.go+++ b/api/pkg/listeners/heartbeat_listener.go@@ -37,6 +37,7 @@ func NewHeartbeatListener(events.EventTypePhoneDeleted: l.onPhoneDeleted,events.EventTypePhoneHeartbeatCheck: l.onPhoneHeartbeatCheck,events.EventTypePhoneHeartbeatOffline: l.onPhoneHeartbeatOffline,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -130,3 +131,21 @@ func (listener *HeartbeatListener) onPhoneHeartbeatOffline(ctx context.Context,return nil}++func (listener *HeartbeatListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Heartbeat] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/integration_3cx_listener.go b/api/pkg/listeners/integration_3cx_listener.goindex 61d955d2..07d0c803 100644--- a/api/pkg/listeners/integration_3cx_listener.go+++ b/api/pkg/listeners/integration_3cx_listener.go@@ -35,6 +35,7 @@ func NewIntegration3CXListener(// events.EventTypeMessagePhoneDelivered: l.OnMessagePhoneDelivered,// events.EventTypeMessageSendFailed: l.OnMessageSendFailed,// events.EventTypeMessagePhoneSent: l.OnMessagePhoneSent,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -113,3 +114,21 @@ func (listener *Integration3CXListener) OnMessagePhoneDelivered(ctx context.Contreturn nil}++func (listener *Integration3CXListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Integration3CX] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/message_listener.go b/api/pkg/listeners/message_listener.goindex 7377dc26..770fe079 100644--- a/api/pkg/listeners/message_listener.go+++ b/api/pkg/listeners/message_listener.go@@ -43,6 +43,7 @@ func NewMessageListener(events.EventTypeMessageNotificationScheduled: l.onMessageNotificationScheduled,events.MessageThreadAPIDeleted: l.onMessageThreadAPIDeleted,events.MessageCallMissed: l.onMessageCallMissed,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -329,3 +330,21 @@ func (listener *MessageListener) onMessageCallMissed(ctx context.Context, eventreturn nil}++func (listener *MessageListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Message] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/message_thread_listener.go b/api/pkg/listeners/message_thread_listener.goindex 2fb9f5a0..e86c8092 100644--- a/api/pkg/listeners/message_thread_listener.go+++ b/api/pkg/listeners/message_thread_listener.go@@ -42,6 +42,7 @@ func NewMessageThreadListener(events.EventTypeMessagePhoneReceived: l.OnMessagePhoneReceived,events.EventTypeMessageNotificationScheduled: l.onMessageNotificationScheduled,events.EventTypeMessageSendExpired: l.onMessageExpired,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -296,6 +297,24 @@ func (listener *MessageThreadListener) onMessageExpired(ctx context.Context, evereturn nil}+func (listener *MessageThreadListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.MessageThread] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+func (listener *MessageThreadListener) updateThread(ctx context.Context, params services.MessageThreadUpdateParams) error {return listener.service.UpdateThread(ctx, params)}diff --git a/api/pkg/listeners/phone_notification_listener.go b/api/pkg/listeners/phone_notification_listener.goindex 715be3ee..e1b3eef7 100644--- a/api/pkg/listeners/phone_notification_listener.go+++ b/api/pkg/listeners/phone_notification_listener.go@@ -37,6 +37,7 @@ func NewNotificationListener(events.EventTypeMessageSendRetry: l.onMessageSendRetry,events.EventTypeMessageNotificationSend: l.onMessageNotificationSend,events.PhoneHeartbeatMissed: l.onPhoneHeartbeatMissed,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -146,3 +147,21 @@ func (listener *PhoneNotificationListener) onMessageNotificationSend(ctx contextreturn nil}++func (listener *PhoneNotificationListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Phone] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/user_listener.go b/api/pkg/listeners/user_listener.goindex e83c1dff..d9518a45 100644--- a/api/pkg/listeners/user_listener.go+++ b/api/pkg/listeners/user_listener.go@@ -39,6 +39,7 @@ func NewUserListener(events.UserSubscriptionUpdated: l.OnUserSubscriptionUpdated,events.UserSubscriptionExpired: l.OnUserSubscriptionExpired,events.UserAPIKeyRotated: l.onUserAPIKeyRotated,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -162,3 +163,21 @@ func (listener *UserListener) OnUserSubscriptionUpdated(ctx context.Context, evereturn nil}++func (listener *UserListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAuthUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.AuthUser] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/listeners/webhook_listener.go b/api/pkg/listeners/webhook_listener.goindex f848e707..d0550ad0 100644--- a/api/pkg/listeners/webhook_listener.go+++ b/api/pkg/listeners/webhook_listener.go@@ -39,6 +39,7 @@ func NewWebhookListener(events.EventTypePhoneHeartbeatOnline: l.onPhoneHeartbeatOnline,events.EventTypePhoneHeartbeatOffline: l.onPhoneHeartbeatOffline,events.MessageCallMissed: l.onMessageCallMissed,+ events.UserAccountDeleted: l.onUserAccountDeleted,}}@@ -193,3 +194,21 @@ func (listener *WebhookListener) onMessageCallMissed(ctx context.Context, eventreturn nil}++func (listener *WebhookListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {+ ctx, span := listener.tracer.Start(ctx)+ defer span.End()++ var payload events.UserAccountDeletedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {+ msg := fmt.Sprintf("cannot delete [entities.Webhook] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}diff --git a/api/pkg/repositories/billing_usage_repository.go b/api/pkg/repositories/billing_usage_repository.goindex 961d60d0..e9c4ffdb 100644--- a/api/pkg/repositories/billing_usage_repository.go+++ b/api/pkg/repositories/billing_usage_repository.go@@ -20,4 +20,7 @@ type BillingUsageRepository interface {// GetHistory returns past billing usage by entities.UserIDGetHistory(ctx context.Context, userID entities.UserID, params IndexParams) (*[]entities.BillingUsage, error)++ // DeleteForUser deletes all billing usage for an entities.UserID+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/discord_repository.go b/api/pkg/repositories/discord_repository.goindex 560ffcfd..13eba9c3 100644--- a/api/pkg/repositories/discord_repository.go+++ b/api/pkg/repositories/discord_repository.go@@ -27,4 +27,7 @@ type DiscordRepository interface {// Delete an entities.DiscordDelete(ctx context.Context, userID entities.UserID, DiscordID uuid.UUID) error++ // DeleteAllForUser deletes all entities.Discord for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/event_listener_log_repository.go b/api/pkg/repositories/event_listener_log_repository.godeleted file mode 100644index a496c617..00000000--- a/api/pkg/repositories/event_listener_log_repository.go+++ /dev/null@@ -1,16 +0,0 @@-package repositories--import (- "context"-- "github.com/NdoleStudio/httpsms/pkg/entities"-)--// EventListenerLogRepository loads and persists an entities.EventListenerLog-type EventListenerLogRepository interface {- // Store a new entities.EventListenerLog- Store(ctx context.Context, log *entities.EventListenerLog) error-- // Has verifies that the listener has not already been called- Has(ctx context.Context, eventID string, handler string) (bool, error)-}diff --git a/api/pkg/repositories/event_repository.go b/api/pkg/repositories/event_repository.godeleted file mode 100644index a1343256..00000000--- a/api/pkg/repositories/event_repository.go+++ /dev/null@@ -1,19 +0,0 @@-package repositories--import (- "context"-- cloudevents "github.com/cloudevents/sdk-go/v2"-)--// EventRepository is responsible for persisting cloudevents.Event-type EventRepository interface {- // Create a new entities.Message- Create(ctx context.Context, event cloudevents.Event) error-- // Save a new entities.Message- Save(ctx context.Context, event cloudevents.Event) error-- // FetchAll returns all cloudevents.Event ordered by time in ascending order- FetchAll(ctx context.Context) (*[]cloudevents.Event, error)-}diff --git a/api/pkg/repositories/gorm_billing_usage_repository.go b/api/pkg/repositories/gorm_billing_usage_repository.goindex 62211618..4df8e65d 100644--- a/api/pkg/repositories/gorm_billing_usage_repository.go+++ b/api/pkg/repositories/gorm_billing_usage_repository.go@@ -35,6 +35,19 @@ func NewGormBillingUsageRepository(}}+// DeleteForUser deletes all billing usages for a user+func (repository *gormBillingUsageRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.BillingUsage{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.BillingUsage{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// RegisterSentMessage registers a message as sentfunc (repository *gormBillingUsageRepository) RegisterSentMessage(ctx context.Context, timestamp time.Time, userID entities.UserID) error {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_discord_repository.go b/api/pkg/repositories/gorm_discord_repository.goindex 9b08bbb3..796f6dfb 100644--- a/api/pkg/repositories/gorm_discord_repository.go+++ b/api/pkg/repositories/gorm_discord_repository.go@@ -32,6 +32,18 @@ func NewGormDiscordRepository(}}+func (repository *gormDiscordRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Discord{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Discord{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+func (repository *gormDiscordRepository) Save(ctx context.Context, Discord *entities.Discord) error {ctx, span := repository.tracer.Start(ctx)defer span.End()diff --git a/api/pkg/repositories/gorm_event_listener_log_repository.go b/api/pkg/repositories/gorm_event_listener_log_repository.godeleted file mode 100644index 5b909620..00000000--- a/api/pkg/repositories/gorm_event_listener_log_repository.go+++ /dev/null@@ -1,64 +0,0 @@-package repositories--import (- "context"- "fmt"-- "github.com/NdoleStudio/httpsms/pkg/entities"- "github.com/NdoleStudio/httpsms/pkg/telemetry"- "github.com/palantir/stacktrace"- "gorm.io/gorm"-)--// gormEventListenerLogRepository is responsible for persisting entities.EventListenerLog-type gormEventListenerLogRepository struct {- logger telemetry.Logger- tracer telemetry.Tracer- db *gorm.DB-}--// NewGormEventListenerLogRepository creates the GORM version of the EventListenerLogRepository-func NewGormEventListenerLogRepository(- logger telemetry.Logger,- tracer telemetry.Tracer,- db *gorm.DB,-) EventListenerLogRepository {- return &gormEventListenerLogRepository{- logger: logger.WithService(fmt.Sprintf("%T", &gormEventRepository{})),- tracer: tracer,- db: db,- }-}--// Store a new entities.Message-func (repository *gormEventListenerLogRepository) Store(ctx context.Context, message *entities.EventListenerLog) error {- ctx, span := repository.tracer.Start(ctx)- defer span.End()-- if err := repository.db.WithContext(ctx).Create(message).Error; err != nil {- msg := fmt.Sprintf("cannot save message with ID [%s]", message.ID)- return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))- }-- return nil-}--// Has checks if an event has been handled-func (repository *gormEventListenerLogRepository) Has(ctx context.Context, eventID string, handler string) (bool, error) {- ctx, span := repository.tracer.Start(ctx)- defer span.End()-- var exists bool- err := repository.db.WithContext(ctx).Model(&entities.EventListenerLog{}).- Select("count(*) > 0").- Where("event_id = ?", eventID).- Where("handler = ?", handler).- Find(&exists).- Error- if err != nil {- msg := fmt.Sprintf("cannot check if log exists with event ID [%s] and handler [%s]", eventID, handler)- return exists, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))- }-- return exists, nil-}diff --git a/api/pkg/repositories/gorm_event_repository.go b/api/pkg/repositories/gorm_event_repository.godeleted file mode 100644index 0123891e..00000000--- a/api/pkg/repositories/gorm_event_repository.go+++ /dev/null@@ -1,124 +0,0 @@-package repositories--import (- "context"- "encoding/json"- "fmt"- "time"-- "github.com/NdoleStudio/httpsms/pkg/telemetry"- cloudevents "github.com/cloudevents/sdk-go/v2"- "github.com/google/uuid"- "github.com/palantir/stacktrace"- "gorm.io/datatypes"- "gorm.io/gorm"-)--// GormEvent is a serialized version of cloudevents.Event-type GormEvent struct {- ID uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;"`- Time time.Time- CreatedAt time.Time- Source string- Type string- Data datatypes.JSON-}--// TableName overrides the table name used by GormEvent to `events`-func (GormEvent) TableName() string {- return "events"-}--type gormEventRepository struct {- logger telemetry.Logger- tracer telemetry.Tracer- db *gorm.DB-}--// NewGormEventRepository creates the GORM version of the EventRepository-func NewGormEventRepository(- logger telemetry.Logger,- tracer telemetry.Tracer,- db *gorm.DB,-) EventRepository {- return &gormEventRepository{- logger: logger.WithService(fmt.Sprintf("%T", &gormEventRepository{})),- tracer: tracer,- db: db,- }-}--// FetchAll returns all cloudevents.Event ordered by time in ascending order-func (repository *gormEventRepository) FetchAll(ctx context.Context) (*[]cloudevents.Event, error) {- ctx, span := repository.tracer.Start(ctx)- defer span.End()-- var events []GormEvent- if err := repository.db.WithContext(ctx).Order("time ASC").Find(&events).Error; err != nil {- msg := fmt.Sprintf("cannot fetch all cloudevents")- return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))- }-- results := make([]cloudevents.Event, 0, len(events))- for _, event := range events {- var cloudevent cloudevents.Event- if err := json.Unmarshal(event.Data, &cloudevent); err != nil {- msg := fmt.Sprintf("cannot unmarshal [%s] into [%T]", event.Data, cloudevent)- return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))- }- results = append(results, cloudevent)- }- return &results, nil-}--// Create creates a new cloudevents.Event-func (repository *gormEventRepository) Create(ctx context.Context, event cloudevents.Event) error {- ctx, span := repository.tracer.Start(ctx)- defer span.End()-- data, err := event.MarshalJSON()- if err != nil {- return stacktrace.Propagate(err, fmt.Sprintf("cannot marshall event [%s] and type [%s] into JSON", event.ID(), event.Type()))- }-- gormEvent := GormEvent{- ID: uuid.MustParse(event.ID()),- Time: event.Time(),- Source: event.Source(),- CreatedAt: event.Time().UTC(),- Type: event.Type(),- Data: datatypes.JSON(data),- }-- if err = repository.db.WithContext(ctx).Create(gormEvent).Error; err != nil {- return stacktrace.Propagate(err, fmt.Sprintf("cannot create event [%s] and type [%s]", event.ID(), event.Type()))- }-- return nil-}--// Save updates a cloudevents.Event-func (repository *gormEventRepository) Save(ctx context.Context, event cloudevents.Event) error {- ctx, span := repository.tracer.Start(ctx)- defer span.End()-- data, err := event.MarshalJSON()- if err != nil {- return stacktrace.Propagate(err, fmt.Sprintf("cannot marshall event [%s] and type [%s] into JSON", event.ID(), event.Type()))- }-- gormEvent := GormEvent{- ID: uuid.MustParse(event.ID()),- Time: event.Time(),- Source: event.Source(),- CreatedAt: event.Time().UTC(),- Type: event.Type(),- Data: datatypes.JSON(data),- }-- if err = repository.db.WithContext(ctx).Save(gormEvent).Error; err != nil {- return stacktrace.Propagate(err, fmt.Sprintf("cannot save event [%s] and type [%s]", event.ID(), event.Type()))- }-- return nil-}diff --git a/api/pkg/repositories/gorm_heartbeat_monitor_repository.go b/api/pkg/repositories/gorm_heartbeat_monitor_repository.goindex 104ee258..b88c15e2 100644--- a/api/pkg/repositories/gorm_heartbeat_monitor_repository.go+++ b/api/pkg/repositories/gorm_heartbeat_monitor_repository.go@@ -22,6 +22,18 @@ type gormHeartbeatMonitorRepository struct {db *gorm.DB}+func (repository *gormHeartbeatMonitorRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.HeartbeatMonitor{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.HeartbeatMonitor{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// UpdatePhoneOnline updates the online status of a phonefunc (repository *gormHeartbeatMonitorRepository) UpdatePhoneOnline(ctx context.Context, userID entities.UserID, monitorID uuid.UUID, isOnline bool) error {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_heartbeat_repository.go b/api/pkg/repositories/gorm_heartbeat_repository.goindex 160bdeea..8e763f60 100644--- a/api/pkg/repositories/gorm_heartbeat_repository.go+++ b/api/pkg/repositories/gorm_heartbeat_repository.go@@ -32,6 +32,18 @@ func NewGormHeartbeatRepository(}}+func (repository *gormHeartbeatRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Heartbeat{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Heartbeat{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+func (repository *gormHeartbeatRepository) Last(ctx context.Context, userID entities.UserID, owner string) (*entities.Heartbeat, error) {ctx, span := repository.tracer.Start(ctx)defer span.End()diff --git a/api/pkg/repositories/gorm_integration_3cx_repository.go b/api/pkg/repositories/gorm_integration_3cx_repository.goindex 9caedf8a..64b55257 100644--- a/api/pkg/repositories/gorm_integration_3cx_repository.go+++ b/api/pkg/repositories/gorm_integration_3cx_repository.go@@ -31,6 +31,18 @@ func NewGormIntegration3CXRepository(}}+func (repository *gormIntegration3CxRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Integration3CX{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Integration3CX{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// Load an entities.Integration3CX based on the entities.UserIDfunc (repository *gormIntegration3CxRepository) Load(ctx context.Context, userID entities.UserID) (*entities.Integration3CX, error) {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_message_repository.go b/api/pkg/repositories/gorm_message_repository.goindex 0fc4e7e0..955f1f0d 100644--- a/api/pkg/repositories/gorm_message_repository.go+++ b/api/pkg/repositories/gorm_message_repository.go@@ -35,6 +35,18 @@ func NewGormMessageRepository(}}+func (repository *gormMessageRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Message{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Message{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// DeleteByOwnerAndContact deletes all the messages between and owner and a contactfunc (repository *gormMessageRepository) DeleteByOwnerAndContact(ctx context.Context, userID entities.UserID, owner string, contact string) error {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_message_thread_repository.go b/api/pkg/repositories/gorm_message_thread_repository.goindex ccf32c5b..244e8b58 100644--- a/api/pkg/repositories/gorm_message_thread_repository.go+++ b/api/pkg/repositories/gorm_message_thread_repository.go@@ -35,6 +35,18 @@ func NewGormMessageThreadRepository(}}+func (repository *gormMessageThreadRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.MessageThread{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.MessageThread{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// Delete the message thread for a userfunc (repository *gormMessageThreadRepository) Delete(ctx context.Context, userID entities.UserID, messageThreadID uuid.UUID) error {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_phone_notification_repository.go b/api/pkg/repositories/gorm_phone_notification_repository.goindex a901feaa..f491e4b3 100644--- a/api/pkg/repositories/gorm_phone_notification_repository.go+++ b/api/pkg/repositories/gorm_phone_notification_repository.go@@ -35,6 +35,18 @@ func NewGormPhoneNotificationRepository(}}+func (repository *gormPhoneNotificationRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.PhoneNotification{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.PhoneNotification{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// UpdateStatus of an entities.PhoneNotificationfunc (repository *gormPhoneNotificationRepository) UpdateStatus(ctx context.Context, notificationID uuid.UUID, status entities.PhoneNotificationStatus) error {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_phone_repository.go b/api/pkg/repositories/gorm_phone_repository.goindex 5ee45237..b45f7cff 100644--- a/api/pkg/repositories/gorm_phone_repository.go+++ b/api/pkg/repositories/gorm_phone_repository.go@@ -32,6 +32,18 @@ func NewGormPhoneRepository(}}+func (repository *gormPhoneRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Phone{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Phone{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// LoadByID loads a phone by IDfunc (repository *gormPhoneRepository) LoadByID(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) (*entities.Phone, error) {ctx, span := repository.tracer.Start(ctx)diff --git a/api/pkg/repositories/gorm_user_repository.go b/api/pkg/repositories/gorm_user_repository.goindex 4857ee86..0099515c 100644--- a/api/pkg/repositories/gorm_user_repository.go+++ b/api/pkg/repositories/gorm_user_repository.go@@ -42,6 +42,19 @@ func NewGormUserRepository(}}+// Delete deletes a user+func (repository *gormUserRepository) Delete(ctx context.Context, user *entities.User) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Delete(user).Error; err != nil {+ msg := fmt.Sprintf("cannot delete user with ID [%s]", user.ID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+func (repository *gormUserRepository) RotateAPIKey(ctx context.Context, userID entities.UserID) (*entities.User, error) {ctx, span := repository.tracer.Start(ctx)defer span.End()diff --git a/api/pkg/repositories/gorm_webhook_repository.go b/api/pkg/repositories/gorm_webhook_repository.goindex 2aae5734..880ad34f 100644--- a/api/pkg/repositories/gorm_webhook_repository.go+++ b/api/pkg/repositories/gorm_webhook_repository.go@@ -32,6 +32,18 @@ func NewGormWebhookRepository(}}+func (repository *gormWebhookRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span := repository.tracer.Start(ctx)+ defer span.End()++ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Webhook{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Webhook{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+func (repository *gormWebhookRepository) Save(ctx context.Context, webhook *entities.Webhook) error {ctx, span := repository.tracer.Start(ctx)defer span.End()diff --git a/api/pkg/repositories/heartbeat_monitor_repository.go b/api/pkg/repositories/heartbeat_monitor_repository.goindex 40b81438..ddcde94d 100644--- a/api/pkg/repositories/heartbeat_monitor_repository.go+++ b/api/pkg/repositories/heartbeat_monitor_repository.go@@ -27,4 +27,7 @@ type HeartbeatMonitorRepository interface {// UpdatePhoneOnline updates the phone online status of a monitorUpdatePhoneOnline(ctx context.Context, userID entities.UserID, monitorID uuid.UUID, online bool) error++ // DeleteAllForUser deletes all entities.HeartbeatMonitor for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/heartbeat_repository.go b/api/pkg/repositories/heartbeat_repository.goindex 9bc8f665..cf35cd9c 100644--- a/api/pkg/repositories/heartbeat_repository.go+++ b/api/pkg/repositories/heartbeat_repository.go@@ -16,4 +16,7 @@ type HeartbeatRepository interface {// Last entities.Heartbeat returns the last heartbeatLast(ctx context.Context, userID entities.UserID, owner string) (*entities.Heartbeat, error)++ // DeleteAllForUser deletes all entities.Heartbeat for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/integration_3cx_repository.go b/api/pkg/repositories/integration_3cx_repository.goindex cd6f533c..09cfea29 100644--- a/api/pkg/repositories/integration_3cx_repository.go+++ b/api/pkg/repositories/integration_3cx_repository.go@@ -13,4 +13,7 @@ type Integration3CxRepository interface {// Load an entities.Integration3CX based on the entities.UserIDLoad(ctx context.Context, userID entities.UserID) (*entities.Integration3CX, error)++ // DeleteAllForUser deletes all entities.Integration3CX for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/message_repository.go b/api/pkg/repositories/message_repository.goindex 971aecde..3f742cc6 100644--- a/api/pkg/repositories/message_repository.go+++ b/api/pkg/repositories/message_repository.go@@ -35,4 +35,7 @@ type MessageRepository interface {// DeleteByOwnerAndContact deletes messages between an owner and a contactDeleteByOwnerAndContact(ctx context.Context, userID entities.UserID, owner string, contact string) error++ // DeleteAllForUser deletes all entities.Message for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/message_thread_repository.go b/api/pkg/repositories/message_thread_repository.goindex 4e53a675..542fd519 100644--- a/api/pkg/repositories/message_thread_repository.go+++ b/api/pkg/repositories/message_thread_repository.go@@ -30,4 +30,7 @@ type MessageThreadRepository interface {// Delete an entities.MessageThread by IDDelete(ctx context.Context, userID entities.UserID, messageThreadID uuid.UUID) error++ // DeleteAllForUser deletes all entities.MessageThread for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/phone_notification_repository.go b/api/pkg/repositories/phone_notification_repository.goindex 299e165d..87f78490 100644--- a/api/pkg/repositories/phone_notification_repository.go+++ b/api/pkg/repositories/phone_notification_repository.go@@ -15,4 +15,7 @@ type PhoneNotificationRepository interface {// UpdateStatus of a notificationUpdateStatus(ctx context.Context, notificationID uuid.UUID, status entities.PhoneNotificationStatus) error++ // DeleteAllForUser deletes all entities.PhoneNotification for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/phone_repository.go b/api/pkg/repositories/phone_repository.goindex bd124450..c9e82b98 100644--- a/api/pkg/repositories/phone_repository.go+++ b/api/pkg/repositories/phone_repository.go@@ -24,4 +24,7 @@ type PhoneRepository interface {// Delete an entities.PhoneDelete(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) error++ // DeleteAllForUser deletes all entities.Phone for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/repositories/user_repository.go b/api/pkg/repositories/user_repository.goindex 2785bba1..bcfc22e8 100644--- a/api/pkg/repositories/user_repository.go+++ b/api/pkg/repositories/user_repository.go@@ -28,4 +28,7 @@ type UserRepository interface {// LoadBySubscriptionID loads a user based on the lemonsqueezy subscriptionIDLoadBySubscriptionID(ctx context.Context, subscriptionID string) (*entities.User, error)++ // Delete an entities.User by entities.UserID+ Delete(ctx context.Context, user *entities.User) error}diff --git a/api/pkg/repositories/webhook_repository.go b/api/pkg/repositories/webhook_repository.goindex 361f4599..f1951fc0 100644--- a/api/pkg/repositories/webhook_repository.go+++ b/api/pkg/repositories/webhook_repository.go@@ -24,4 +24,7 @@ type WebhookRepository interface {// Delete an entities.WebhookDelete(ctx context.Context, userID entities.UserID, webhookID uuid.UUID) error++ // DeleteAllForUser deletes all entities.Webhook for a user+ DeleteAllForUser(ctx context.Context, userID entities.UserID) error}diff --git a/api/pkg/services/billing_service.go b/api/pkg/services/billing_service.goindex cbb3e5b5..1d573dbd 100644--- a/api/pkg/services/billing_service.go+++ b/api/pkg/services/billing_service.go@@ -170,6 +170,20 @@ func (service *BillingService) RegisterReceivedMessage(ctx context.Context, messreturn nil}+// DeleteAllForUser deletes all entities.BillingUsage for an entities.UserID.+func (service *BillingService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.billingUsageRepository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete [entities.BillingUsage] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.BillingUsage] for user with ID [%s]", userID))+ return nil+}+func (service *BillingService) sendUsageAlert(ctx context.Context, userID entities.UserID) {ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)defer span.End()diff --git a/api/pkg/services/discord_service.go b/api/pkg/services/discord_service.goindex 3bb14d58..059231b9 100644--- a/api/pkg/services/discord_service.go+++ b/api/pkg/services/discord_service.go@@ -53,6 +53,20 @@ func (service *DiscordService) GetByServerID(ctx context.Context, serverID strinreturn service.repository.FindByServerID(ctx, serverID)}+// DeleteAllForUser deletes all entities.Discord for an entities.UserID.+func (service *DiscordService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.Discord] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Discord] for user with ID [%s]", userID))+ return nil+}+// Index fetches the entities.Discord for an entities.UserIDfunc (service *DiscordService) Index(ctx context.Context, userID entities.UserID, params repositories.IndexParams) ([]*entities.Discord, error) {ctx, span := service.tracer.Start(ctx)diff --git a/api/pkg/services/heartbeat_service.go b/api/pkg/services/heartbeat_service.goindex 5b22b555..9160923d 100644--- a/api/pkg/services/heartbeat_service.go+++ b/api/pkg/services/heartbeat_service.go@@ -49,6 +49,25 @@ func NewHeartbeatService(}}+// DeleteAllForUser deletes all entities.Heartbeat for an entities.UserID.+func (service *HeartbeatService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.Heartbeat] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := service.monitorRepository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.HeartbeatMonitor] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Heartbeat] and [entities.HeartbeatMonitor] for user with ID [%s]", userID))+ return nil+}+// Index fetches the heartbeats for a phone numberfunc (service *HeartbeatService) Index(ctx context.Context, userID entities.UserID, owner string, params repositories.IndexParams) (*[]entities.Heartbeat, error) {ctx, span := service.tracer.Start(ctx)diff --git a/api/pkg/services/integration_3cx_service.go b/api/pkg/services/integration_3cx_service.goindex d6366bf3..3859111c 100644--- a/api/pkg/services/integration_3cx_service.go+++ b/api/pkg/services/integration_3cx_service.go@@ -43,6 +43,20 @@ func NewIntegration3CXService(}}+// DeleteAllForUser deletes all entities.Integration3CX for an entities.UserID.+func (service *Integration3CXService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.Integration3CX] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Integration3CX] for user with ID [%s]", userID))+ return nil+}+// Send an event to a 3CX webhookfunc (service *Integration3CXService) Send(ctx context.Context, userID entities.UserID, event cloudevents.Event) error {ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)diff --git a/api/pkg/services/marketting_service.go b/api/pkg/services/marketting_service.goindex b6513dec..bb7c0054 100644--- a/api/pkg/services/marketting_service.go+++ b/api/pkg/services/marketting_service.go@@ -5,6 +5,7 @@ import ("encoding/json""fmt""log"+ "net/http""strings""github.com/sendgrid/sendgrid-go"@@ -22,13 +23,21 @@ type MarketingService struct {tracer telemetry.TracerauthClient *auth.ClientsendgridAPIKey string+ sendgridHost stringsendgridListID string}type sendgridContact struct {- FirstName string `json:"first_name"`- LastName string `json:"last_name"`- Email string `json:"email"`+ FirstName string `json:"first_name"`+ LastName string `json:"last_name"`+ ExternalID string `json:"external_id"`+ Email string `json:"email"`+ ID string `json:"id,omitempty"`+}++type sendgridSearchResponse struct {+ ContactCount int `json:"contact_count"`+ Result []sendgridContact `json:"result"`}type sendgridContactRequest struct {@@ -48,11 +57,39 @@ func NewMarketingService(logger: logger.WithService(fmt.Sprintf("%T", &MarketingService{})),tracer: tracer,authClient: authClient,+ sendgridHost: "https://api.sendgrid.com",sendgridAPIKey: sendgridAPIKey,sendgridListID: sendgridListID,}}+// DeleteUser a user if exists in the sendgrid list+func (service *MarketingService) DeleteUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ request := sendgrid.GetRequest(service.sendgridAPIKey, "/v3/marketing/contacts/search", service.sendgridHost)+ request.Method = http.MethodPost+ request.Body = []byte(fmt.Sprintf(`{"query": "external_id = '%s' AND CONTAINS(list_ids, '%s')"}`, userID, service.sendgridListID))+ response, err := sendgrid.API(request)+ if err != nil {+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, fmt.Sprintf("cannot search for user with id [%s] in sendgrid list [%s]", userID, service.sendgridListID)))+ }++ data := new(sendgridSearchResponse)+ if err = json.Unmarshal([]byte(response.Body), data); err != nil {+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, fmt.Sprintf("cannot [%s] into [%T]", response.Body, data)))+ }++ if data.ContactCount == 0 {+ ctxLogger.Info(fmt.Sprintf("user with ID [%s] not found in sendgrid list [%s]", userID, service.sendgridListID))+ return nil+ }++ ctxLogger.Info(fmt.Sprintf("deleting sendgrid contact with ID [%s] for user with ID [%s]", data.Result[0].ID, userID))+ return service.DeleteContacts(context.Background(), []string{data.Result[0].ID})+}+// AddToList adds a new user on the onboarding automation.func (service *MarketingService) AddToList(ctx context.Context, user *entities.User) {ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)@@ -83,7 +120,7 @@ func (service *MarketingService) DeleteContacts(ctx context.Context, contactIDsctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)defer span.End()- request := sendgrid.GetRequest(service.sendgridAPIKey, "/v3/marketing/contacts", "https://api.sendgrid.com")+ request := sendgrid.GetRequest(service.sendgridAPIKey, "/v3/marketing/contacts", service.sendgridHost)request.Method = "DELETE"request.QueryParams = map[string]string{"ids": strings.Join(contactIDs, ","),@@ -94,7 +131,7 @@ func (service *MarketingService) DeleteContacts(ctx context.Context, contactIDsreturn stacktrace.Propagate(err, fmt.Sprintf("cannot delete contacts in a sendgrid list [%s]", service.sendgridListID))}- ctxLogger.Info(spew.Sdump(response.Body))+ ctxLogger.Info(fmt.Sprintf("deleted contacts [%s] from sendgrid list [%s] with sendgrid response [%s]", strings.Join(contactIDs, ","), service.sendgridListID, response.Body))return nil}@@ -102,25 +139,28 @@ func (service *MarketingService) toSendgridContact(user *auth.UserRecord) sendgrname := strings.TrimSpace(user.DisplayName)if name == "" {return sendgridContact{- FirstName: "",- LastName: "",- Email: user.Email,+ FirstName: "",+ LastName: "",+ ExternalID: user.UID,+ Email: user.Email,}}parts := strings.Split(name, " ")if len(parts) == 1 {return sendgridContact{- FirstName: name,- LastName: "",- Email: user.Email,+ FirstName: name,+ LastName: "",+ ExternalID: user.UID,+ Email: user.Email,}}return sendgridContact{- FirstName: strings.Join(parts[0:len(parts)-1], " "),- LastName: parts[len(parts)-1],- Email: user.Email,+ FirstName: strings.Join(parts[0:len(parts)-1], " "),+ LastName: parts[len(parts)-1],+ ExternalID: user.UID,+ Email: user.Email,}}diff --git a/api/pkg/services/message_service.go b/api/pkg/services/message_service.goindex 155a4d0a..c972709e 100644--- a/api/pkg/services/message_service.go+++ b/api/pkg/services/message_service.go@@ -94,6 +94,20 @@ func (service *MessageService) GetOutstanding(ctx context.Context, params Messagreturn message, nil}+// DeleteAllForUser deletes all entities.Message for an entities.UserID.+func (service *MessageService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete [entities.Message] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Message] for user with ID [%s]", userID))+ return nil+}+// DeleteMessage deletes a message from the databasefunc (service *MessageService) DeleteMessage(ctx context.Context, source string, message *entities.Message) error {ctx, span := service.tracer.Start(ctx)diff --git a/api/pkg/services/message_thread_service.go b/api/pkg/services/message_thread_service.goindex 18553c01..d2027506 100644--- a/api/pkg/services/message_thread_service.go+++ b/api/pkg/services/message_thread_service.go@@ -50,6 +50,20 @@ type MessageThreadUpdateParams struct {Timestamp time.Time}+// DeleteAllForUser deletes all entities.MessageThread for an entities.UserID.+func (service *MessageThreadService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete [entities.MessageThread] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.MessageThread] for user with ID [%s]", userID))+ return nil+}+// UpdateThread updates a thread between 2 parties when a timestamp changesfunc (service *MessageThreadService) UpdateThread(ctx context.Context, params MessageThreadUpdateParams) error {ctx, span := service.tracer.Start(ctx)diff --git a/api/pkg/services/phone_notification_service.go b/api/pkg/services/phone_notification_service.goindex 605c366f..ab0c873e 100644--- a/api/pkg/services/phone_notification_service.go+++ b/api/pkg/services/phone_notification_service.go@@ -47,6 +47,20 @@ func NewNotificationService(}}+// DeleteAllForUser deletes all entities.PhoneNotification for an entities.UserID.+func (service *PhoneNotificationService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.phoneNotificationRepository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.PhoneNotification] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.PhoneNotification] for user with ID [%s]", userID))+ return nil+}+// SendHeartbeatFCM sends a heartbeat message so the phone can request a heartbeatfunc (service *PhoneNotificationService) SendHeartbeatFCM(ctx context.Context, payload *events.PhoneHeartbeatMissedPayload) error {ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)diff --git a/api/pkg/services/phone_service.go b/api/pkg/services/phone_service.goindex 31e4a327..8dcaedd4 100644--- a/api/pkg/services/phone_service.go+++ b/api/pkg/services/phone_service.go@@ -42,6 +42,20 @@ func NewPhoneService(}}+// DeleteAllForUser deletes all entities.Phone for an entities.UserID.+func (service *PhoneService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.Phone] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Phone] for user with ID [%s]", userID))+ return nil+}+// Index fetches the heartbeats for a phone numberfunc (service *PhoneService) Index(ctx context.Context, authUser entities.AuthUser, params repositories.IndexParams) (*[]entities.Phone, error) {ctx, span := service.tracer.Start(ctx)diff --git a/api/pkg/services/user_service.go b/api/pkg/services/user_service.goindex 8b91b221..0bebcb95 100644--- a/api/pkg/services/user_service.go+++ b/api/pkg/services/user_service.go@@ -5,10 +5,12 @@ import ("fmt""time"+ "firebase.google.com/go/auth"+"github.com/NdoleStudio/httpsms/pkg/events""github.com/NdoleStudio/httpsms/pkg/emails"- lemonsqueezy "github.com/NdoleStudio/lemonsqueezy-go"+ "github.com/NdoleStudio/lemonsqueezy-go""github.com/NdoleStudio/httpsms/pkg/repositories""github.com/google/uuid"@@ -28,6 +30,7 @@ type UserService struct {repository repositories.UserRepositorydispatcher *EventDispatchermarketingService *MarketingService+ authClient *auth.ClientlemonsqueezyClient *lemonsqueezy.Client}@@ -41,6 +44,7 @@ func NewUserService(marketingService *MarketingService,lemonsqueezyClient *lemonsqueezy.Client,dispatcher *EventDispatcher,+ authClient *auth.Client,) (s *UserService) {return &UserService{logger: logger.WithService(fmt.Sprintf("%T", s)),@@ -50,6 +54,7 @@ func NewUserService(emailFactory: emailFactory,repository: repository,dispatcher: dispatcher,+ authClient: authClient,lemonsqueezyClient: lemonsqueezyClient,}}@@ -186,6 +191,46 @@ func (service *UserService) RotateAPIKey(ctx context.Context, source string, usereturn user, nil}+// Delete an entities.User+func (service *UserService) Delete(ctx context.Context, source string, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ user, err := service.repository.Load(ctx, userID)+ if err != nil {+ msg := fmt.Sprintf("cannot load user with ID [%s] from the [%T]", userID, service.repository)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if !user.IsOnFreePlan() && user.SubscriptionRenewsAt != nil && user.SubscriptionRenewsAt.After(time.Now()) {+ msg := fmt.Sprintf("cannot delete user with ID [%s] because they are have an active [%s] subscription which renews at [%s]", userID, user.SubscriptionName, user.SubscriptionRenewsAt)+ return service.tracer.WrapErrorSpan(span, stacktrace.NewError(msg))+ }++ if err = service.repository.Delete(ctx, user); err != nil {+ msg := fmt.Sprintf("could not delete user with ID [%s] from the [%T]", userID, service.repository)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("sucessfully deleted user with ID [%s] in the [%T]", userID, service.repository))++ event, err := service.createEvent(events.UserAccountDeleted, source, &events.UserAccountDeletedPayload{+ UserID: userID,+ Timestamp: time.Now().UTC(),+ })+ if err != nil {+ msg := fmt.Sprintf("cannot create event [%s] for user [%s]", events.UserAccountDeleted, userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err = service.dispatcher.Dispatch(ctx, event); err != nil {+ msg := fmt.Sprintf("cannot dispatch [%s] event for user [%s]", event.Type(), userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}+// SendAPIKeyRotatedEmail sends an email to an entities.User when the API key is rotatedfunc (service *UserService) SendAPIKeyRotatedEmail(ctx context.Context, payload *events.UserAPIKeyRotatedPayload) error {ctx, span := service.tracer.Start(ctx)@@ -394,3 +439,17 @@ func (service *UserService) UpdateSubscription(ctx context.Context, params *evenreturn nil}++// DeleteAuthUser deletes an entities.AuthUser from firebase+func (service *UserService) DeleteAuthUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.authClient.DeleteUser(ctx, userID.String()); err != nil {+ msg := fmt.Sprintf("could not delete [entities.AuthUser] from firebase with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted [entities.AuthUser] from firebase for user with ID [%s]", userID))+ return nil+}diff --git a/api/pkg/services/webhook_service.go b/api/pkg/services/webhook_service.goindex 0cd7a741..d75bf500 100644--- a/api/pkg/services/webhook_service.go+++ b/api/pkg/services/webhook_service.go@@ -54,6 +54,20 @@ func NewWebhookService(}}+// DeleteAllForUser deletes all entities.Webhook for an entities.UserID.+func (service *WebhookService) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {+ ctx, span, ctxLogger := service.tracer.StartWithLogger(ctx, service.logger)+ defer span.End()++ if err := service.repository.DeleteAllForUser(ctx, userID); err != nil {+ msg := fmt.Sprintf("could not delete all [entities.Webhook] for user with ID [%s]", userID)+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ ctxLogger.Info(fmt.Sprintf("deleted all [entities.Webhook] for user with ID [%s]", userID))+ return nil+}+// Index fetches the entities.Webhook for an entities.UserIDfunc (service *WebhookService) Index(ctx context.Context, userID entities.UserID, params repositories.IndexParams) ([]*entities.Webhook, error) {ctx, span := service.tracer.Start(ctx)diff --git a/web/models/user.ts b/web/models/user.tsindex 022144fc..8e615deb 100644--- a/web/models/user.ts+++ b/web/models/user.ts@@ -9,7 +9,7 @@ export interface User {/** @example "free" */subscription_name: string/** @example "2022-06-05T14:26:02.302718+03:00" */- subscription_renews_at: string+ subscription_renews_at: string | null/** @example "on_trial" */subscription_status: stringcreated_at: stringdiff --git a/web/pages/index.vue b/web/pages/index.vueindex dd7fbbc6..f201fb81 100644--- a/web/pages/index.vue+++ b/web/pages/index.vue@@ -51,8 +51,8 @@</v-btn></div><p class="text-body-2 mt-2">- ⚡Trusted by <b>3,929+</b> happy users who have sent or received- more than <b>1,095,183+</b> messages.+ ⚡Trusted by <b>5,952+</b> happy users who have sent or received+ more than <b>2,860,049+</b> messages.</p><divclass="mt-4"diff --git a/web/pages/login.vue b/web/pages/login.vueindex af65d725..963b347f 100644--- a/web/pages/login.vue+++ b/web/pages/login.vue@@ -14,9 +14,9 @@<span class="text-h3">Welcome</span></div><p class="subtitle-1 text-center text--secondary mt-1 mb-4">- Join <b>3,929+</b> happy users who have sent or+ Join <b>5,952+</b> happy users who have sent or<br />- received more than <b>1,095,183+</b> SMS messages+ received more than <b>2,860,049+</b> SMS messages</p><v-card max-width="360" class="mx-auto"><v-card-text class="px-0">diff --git a/web/pages/settings/index.vue b/web/pages/settings/index.vueindex 390330b1..e0f663af 100644--- a/web/pages/settings/index.vue+++ b/web/pages/settings/index.vue@@ -405,9 +405,75 @@class="mt-4"@click="saveEmailNotifications">- <v-icon></v-icon>+ <v-icon left>{{ mdiContentSave }}</v-icon>Save Notification Settings</v-btn>+ <h5 id="email-notifications" class="text-h4 error--text mb-3 mt-12">+ Delete Account+ </h5>+ <p v-if="hasActiveSubscription" class="text--secondary">+ You cannot delete your account because you have an active+ subscription on httpSMS.+ <router-link class="text-decoration-none" to="/billing"+ >Cancel your subscription</router-link+ >+ before deleting your account.+ </p>+ <p v-else class="text--secondary">+ You can delete all your data on httpSMS by clicking the button+ below. This action is <b>irreversible</b> and all your data will+ be permanently deleted from the httpSMS database instantly and it+ cannot be recovered.+ </p>+ <v-btn+ color="error"+ :loading="deletingAccount"+ class="mt-4"+ :disabled="hasActiveSubscription"+ @click="showDeleteAccountDialog = true"+ >+ <v-icon left>{{ mdiDelete }}</v-icon>+ Delete your Account+ </v-btn>+ <v-dialog+ v-model="showDeleteAccountDialog"+ overlay-opacity="0.9"+ max-width="600px"+ >+ <v-card>+ <v-card-title class="justify-center text-center"+ >Delete your httpSMS account</v-card-title+ >+ <v-card-text class="mt-2 text-center">+ Are you sure you want to delete your account? This action is+ <b>irreversible</b> and all your data will be permanently+ deleted from the httpSMS database instantly.+ </v-card-text>+ <v-card-actions>+ <v-btn+ color="error"+ text+ :loading="deletingAccount"+ @click="deleteUserAccount"+ >+ <v-icon v-if="$vuetify.breakpoint.lgAndUp" left>{{+ mdiDelete+ }}</v-icon>+ Delete My Account+ </v-btn>+ <v-spacer></v-spacer>+ <v-btn+ color="primary"+ @click="showDeleteAccountDialog = false"+ >+ <span v-if="$vuetify.breakpoint.lgAndUp"+ >Keep My account</span+ >+ <span v-else>Close</span>+ </v-btn>+ </v-card-actions>+ </v-card>+ </v-dialog></v-col></v-row></v-container>@@ -784,6 +850,8 @@ export default Vue.extend({showRotateApiKey: false,rotatingApiKey: false,showQrCodeDialog: false,+ deletingAccount: false,+ showDeleteAccountDialog: false,activeWebhook: {id: null,url: '',@@ -837,6 +905,12 @@ export default Vue.extend({}return this.$store.getters.getUser.api_key},+ hasActiveSubscription() {+ if (this.$store.getters.getUser === null) {+ return true+ }+ return this.$store.getters.getUser.subscription_renews_at != null+ },timezones() {return Intl.supportedValuesOf('timeZone')},@@ -1170,6 +1244,31 @@ export default Vue.extend({})},+ deleteUserAccount() {+ this.deletingAccount = true+ this.$store+ .dispatch('deleteUserAccount')+ .then((message) => {+ this.$store.dispatch('addNotification', {+ message: message ?? 'Your account has been deleted successfully',+ type: 'success',+ })+ this.$fire.auth.signOut().then(() => {+ this.$store.dispatch('setAuthUser', null)+ this.$store.dispatch('resetState')+ this.$store.dispatch('addNotification', {+ type: 'info',+ message: 'You have successfully logged out',+ })+ this.$router.push({ name: 'index' })+ })+ })+ .finally(() => {+ this.deletingAccount = false+ this.showDeleteAccountDialog = false+ })+ },+deletePhone(phoneId) {this.updatingPhone = truethis.$store.dispatch('deletePhone', phoneId).finally(() => {diff --git a/web/store/index.ts b/web/store/index.tsindex 097f1cd6..833b0ea3 100644--- a/web/store/index.ts+++ b/web/store/index.ts@@ -661,6 +661,27 @@ export const actions = {context.commit('setUser', response.data.data)},+ deleteUserAccount(context: ActionContext<State, State>) {+ return new Promise<string>((resolve, reject) => {+ axios+ .delete<ResponsesNoContent>(`/v1/users/me`)+ .then((response: AxiosResponse<ResponsesNoContent>) => {+ resolve(response.data.message)+ })+ .catch(async (error: AxiosError) => {+ await Promise.all([+ context.dispatch('addNotification', {+ message:+ (error.response?.data as any)?.message ??+ 'Error while deleting your user account',+ type: 'error',+ }),+ ])+ reject(getErrorMessages(error))+ })+ })+ },+updateTimezone(context: ActionContext<State, State>,payload: string,