Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

refactor(api): migrate backend from Fiber v2 to v3

Acho Arnold Ewin20ae57ef20cf
diff --git a/api/pkg/di/config.go b/api/pkg/di/config.go
index 586934f9..0c6b8680 100644
--- a/api/pkg/di/config.go
+++ b/api/pkg/di/config.go
@@ -3,6 +3,7 @@ package di
import (
"log"
"os"
+ "strings"
"github.com/joho/godotenv"
)
@@ -23,3 +24,15 @@ func getEnvWithDefault(key, defaultValue string) string {
return value
}
+
+func splitCommaEnv(key, defaultValue string) []string {
+ value := getEnvWithDefault(key, defaultValue)
+ parts := strings.Split(value, ",")
+ result := make([]string, 0, len(parts))
+ for _, part := range parts {
+ if trimmed := strings.TrimSpace(part); trimmed != "" {
+ result = append(result, trimmed)
+ }
+ }
+ return result
+}
diff --git a/api/pkg/di/container.go b/api/pkg/di/container.go
index 7eb15337..f84f5b30 100644
--- a/api/pkg/di/container.go
+++ b/api/pkg/di/container.go
@@ -192,11 +192,11 @@ func (container *Container) App() (app *fiber.App) {
app.Use(
cors.New(
cors.Config{
- AllowOrigins: getEnvWithDefault("CORS_ALLOW_ORIGINS", "*"),
- AllowHeaders: getEnvWithDefault("CORS_ALLOW_HEADERS", "*"),
- AllowMethods: getEnvWithDefault("CORS_ALLOW_METHODS", "GET,POST,PUT,DELETE,OPTIONS"),
+ AllowOrigins: splitCommaEnv("CORS_ALLOW_ORIGINS", "*"),
+ AllowHeaders: splitCommaEnv("CORS_ALLOW_HEADERS", "*"),
+ AllowMethods: splitCommaEnv("CORS_ALLOW_METHODS", "GET,POST,PUT,DELETE,OPTIONS"),
AllowCredentials: false,
- ExposeHeaders: getEnvWithDefault("CORS_EXPOSE_HEADERS", "*"),
+ ExposeHeaders: splitCommaEnv("CORS_EXPOSE_HEADERS", "*"),
},
),
)
diff --git a/api/pkg/handlers/billing_handler.go b/api/pkg/handlers/billing_handler.go
index d5da9a85..90ec8837 100644
--- a/api/pkg/handlers/billing_handler.go
+++ b/api/pkg/handlers/billing_handler.go
@@ -38,8 +38,8 @@ func NewBillingHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *BillingHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/billing/usage-history", h.computeRoute(middlewares, h.UsageHistory)...)
- router.Get("/v1/billing/usage", h.computeRoute(middlewares, h.Usage)...)
+ h.register(router, fiber.MethodGet, "/v1/billing/usage-history", middlewares, h.UsageHistory)
+ h.register(router, fiber.MethodGet, "/v1/billing/usage", middlewares, h.Usage)
}
// UsageHistory returns the usage history of a user
diff --git a/api/pkg/handlers/bulk_message_handler.go b/api/pkg/handlers/bulk_message_handler.go
index e009465a..516cb3c0 100644
--- a/api/pkg/handlers/bulk_message_handler.go
+++ b/api/pkg/handlers/bulk_message_handler.go
@@ -46,8 +46,8 @@ func NewBulkMessageHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *BulkMessageHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/bulk-messages", h.computeRoute(middlewares, h.Index)...)
- router.Post("/v1/bulk-messages", h.computeRoute(middlewares, h.Store)...)
+ h.register(router, fiber.MethodGet, "/v1/bulk-messages", middlewares, h.Index)
+ h.register(router, fiber.MethodPost, "/v1/bulk-messages", middlewares, h.Store)
}
// Index fetches the bulk message order history.
diff --git a/api/pkg/handlers/discord_handler.go b/api/pkg/handlers/discord_handler.go
index 854ec13a..5c02d608 100644
--- a/api/pkg/handlers/discord_handler.go
+++ b/api/pkg/handlers/discord_handler.go
@@ -57,13 +57,13 @@ func NewDiscordHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *DiscordHandler) RegisterRoutes(app *fiber.App, authMiddleware fiber.Handler, middlewares ...fiber.Handler) {
router := app.Group("discord")
- router.Post("/event", h.computeRoute(middlewares, h.Event)...)
+ h.register(router, fiber.MethodPost, "/event", middlewares, h.Event)
authRouter := app.Group("v1/discord-integrations")
- authRouter.Post("/", h.computeRoute(append(middlewares, authMiddleware), h.Store)...)
- authRouter.Get("/", h.computeRoute(append(middlewares, authMiddleware), h.Index)...)
- authRouter.Delete("/:discordID", h.computeRoute(append(middlewares, authMiddleware), h.Delete)...)
- authRouter.Put("/:discordID", h.computeRoute(append(middlewares, authMiddleware), h.Update)...)
+ h.register(authRouter, fiber.MethodPost, "/", append(middlewares, authMiddleware), h.Store)
+ h.register(authRouter, fiber.MethodGet, "/", append(middlewares, authMiddleware), h.Index)
+ h.register(authRouter, fiber.MethodDelete, "/:discordID", append(middlewares, authMiddleware), h.Delete)
+ h.register(authRouter, fiber.MethodPut, "/:discordID", append(middlewares, authMiddleware), h.Update)
}
// Index returns the discord integrations of a user
diff --git a/api/pkg/handlers/events_handler.go b/api/pkg/handlers/events_handler.go
index 32184b68..f1fe1aaa 100644
--- a/api/pkg/handlers/events_handler.go
+++ b/api/pkg/handlers/events_handler.go
@@ -38,7 +38,7 @@ func NewEventsHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *EventsHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Post("/v1/events", h.computeRoute(middlewares, h.Dispatch)...)
+ h.register(router, fiber.MethodPost, "/v1/events", middlewares, h.Dispatch)
}
// Dispatch a cloud event
diff --git a/api/pkg/handlers/handler.go b/api/pkg/handlers/handler.go
index 23e3028f..070e2db7 100644
--- a/api/pkg/handlers/handler.go
+++ b/api/pkg/handlers/handler.go
@@ -123,8 +123,13 @@ func (h *handler) userIDFomContext(c fiber.Ctx) entities.UserID {
return h.userFromContext(c).ID
}
-func (h *handler) computeRoute(middlewares []fiber.Handler, route fiber.Handler) []fiber.Handler {
- return append(append([]fiber.Handler{}, middlewares...), route)
+func (h *handler) register(router fiber.Router, method, path string, middlewares []fiber.Handler, route fiber.Handler) {
+ handlers := make([]any, 0, len(middlewares)+1)
+ for _, middleware := range middlewares {
+ handlers = append(handlers, middleware)
+ }
+ handlers = append(handlers, route)
+ router.Add([]string{method}, path, handlers[0], handlers[1:]...)
}
func (h *handler) mergeErrors(errors ...url.Values) url.Values {
diff --git a/api/pkg/handlers/heartbeat_handler.go b/api/pkg/handlers/heartbeat_handler.go
index c8b2d66d..c16c80a6 100644
--- a/api/pkg/handlers/heartbeat_handler.go
+++ b/api/pkg/handlers/heartbeat_handler.go
@@ -41,12 +41,12 @@ func NewHeartbeatHandler(
// RegisterRoutes registers the routes for the HeartbeatHandler
func (h *HeartbeatHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/heartbeats", h.computeRoute(middlewares, h.Index)...)
+ h.register(router, fiber.MethodGet, "/v1/heartbeats", middlewares, h.Index)
}
// RegisterPhoneAPIKeyRoutes registers the routes for the HeartbeatHandler
func (h *HeartbeatHandler) RegisterPhoneAPIKeyRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Post("/v1/heartbeats", h.computeRoute(middlewares, h.Store)...)
+ h.register(router, fiber.MethodPost, "/v1/heartbeats", middlewares, h.Store)
}
// Index returns the heartbeats of a phone number
diff --git a/api/pkg/handlers/integration_3cx_handler.go b/api/pkg/handlers/integration_3cx_handler.go
index 99f9a8b1..75ea54b0 100644
--- a/api/pkg/handlers/integration_3cx_handler.go
+++ b/api/pkg/handlers/integration_3cx_handler.go
@@ -39,7 +39,7 @@ func NewIntegration3CxHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *Integration3CXHandler) RegisterRoutes(app *fiber.App, middlewares ...fiber.Handler) {
router := app.Group("integration/3cx/")
- router.Post("/messages", h.computeRoute(middlewares, h.Messages)...)
+ h.register(router, fiber.MethodPost, "/messages", middlewares, h.Messages)
}
// Messages consumes a 3cx event
diff --git a/api/pkg/handlers/lemonsqueezy_handler.go b/api/pkg/handlers/lemonsqueezy_handler.go
index 4bf65cdf..853bc051 100644
--- a/api/pkg/handlers/lemonsqueezy_handler.go
+++ b/api/pkg/handlers/lemonsqueezy_handler.go
@@ -41,7 +41,7 @@ func NewLemonsqueezyHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *LemonsqueezyHandler) RegisterRoutes(app *fiber.App, middlewares ...fiber.Handler) {
router := app.Group("lemonsqueezy")
- router.Post("/event", h.computeRoute(middlewares, h.Event)...)
+ h.register(router, fiber.MethodPost, "/event", middlewares, h.Event)
}
// Event handles lemonsqueezy events
diff --git a/api/pkg/handlers/message_handler.go b/api/pkg/handlers/message_handler.go
index df1fd1bd..afe0127a 100644
--- a/api/pkg/handlers/message_handler.go
+++ b/api/pkg/handlers/message_handler.go
@@ -50,20 +50,20 @@ func NewMessageHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *MessageHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Post("/v1/messages/send", h.computeRoute(middlewares, h.PostSend)...)
- router.Post("/v1/messages/bulk-send", h.computeRoute(middlewares, h.BulkSend)...)
- router.Get("/v1/messages", h.computeRoute(middlewares, h.Index)...)
- router.Get("/v1/messages/search", h.computeRoute(middlewares, h.Search)...)
- router.Get("/v1/messages/:messageID", h.computeRoute(middlewares, h.Get)...)
- router.Delete("/v1/messages/:messageID", h.computeRoute(middlewares, h.Delete)...)
+ h.register(router, fiber.MethodPost, "/v1/messages/send", middlewares, h.PostSend)
+ h.register(router, fiber.MethodPost, "/v1/messages/bulk-send", middlewares, h.BulkSend)
+ h.register(router, fiber.MethodGet, "/v1/messages", middlewares, h.Index)
+ h.register(router, fiber.MethodGet, "/v1/messages/search", middlewares, h.Search)
+ h.register(router, fiber.MethodGet, "/v1/messages/:messageID", middlewares, h.Get)
+ h.register(router, fiber.MethodDelete, "/v1/messages/:messageID", middlewares, h.Delete)
}
// RegisterPhoneAPIKeyRoutes registers the routes for the MessageHandler
func (h *MessageHandler) RegisterPhoneAPIKeyRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Post("/v1/messages/:messageID/events", h.computeRoute(middlewares, h.PostEvent)...)
- router.Post("/v1/messages/receive", h.computeRoute(middlewares, h.PostReceive)...)
- router.Post("/v1/messages/calls/missed", h.computeRoute(middlewares, h.PostCallMissed)...)
- router.Get("/v1/messages/outstanding", h.computeRoute(middlewares, h.GetOutstanding)...)
+ h.register(router, fiber.MethodPost, "/v1/messages/:messageID/events", middlewares, h.PostEvent)
+ h.register(router, fiber.MethodPost, "/v1/messages/receive", middlewares, h.PostReceive)
+ h.register(router, fiber.MethodPost, "/v1/messages/calls/missed", middlewares, h.PostCallMissed)
+ h.register(router, fiber.MethodGet, "/v1/messages/outstanding", middlewares, h.GetOutstanding)
}
// PostSend a new entities.Message
diff --git a/api/pkg/handlers/message_send_schedule_handler.go b/api/pkg/handlers/message_send_schedule_handler.go
index a7cdee2e..e94e300b 100644
--- a/api/pkg/handlers/message_send_schedule_handler.go
+++ b/api/pkg/handlers/message_send_schedule_handler.go
@@ -44,10 +44,10 @@ func NewMessageSendScheduleHandler(
// RegisterRoutes registers send schedule routes.
func (h *MessageSendScheduleHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/send-schedules", h.computeRoute(middlewares, h.Index)...)
- router.Post("/v1/send-schedules", h.computeRoute(middlewares, h.Store)...)
- router.Put("/v1/send-schedules/:scheduleID", h.computeRoute(middlewares, h.Update)...)
- router.Delete("/v1/send-schedules/:scheduleID", h.computeRoute(middlewares, h.Delete)...)
+ h.register(router, fiber.MethodGet, "/v1/send-schedules", middlewares, h.Index)
+ h.register(router, fiber.MethodPost, "/v1/send-schedules", middlewares, h.Store)
+ h.register(router, fiber.MethodPut, "/v1/send-schedules/:scheduleID", middlewares, h.Update)
+ h.register(router, fiber.MethodDelete, "/v1/send-schedules/:scheduleID", middlewares, h.Delete)
}
// Index lists all send schedules for the authenticated user.
diff --git a/api/pkg/handlers/message_thread_handler.go b/api/pkg/handlers/message_thread_handler.go
index d67c89ca..1ff04321 100644
--- a/api/pkg/handlers/message_thread_handler.go
+++ b/api/pkg/handlers/message_thread_handler.go
@@ -41,9 +41,9 @@ func NewMessageThreadHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *MessageThreadHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/message-threads", h.computeRoute(middlewares, h.Index)...)
- router.Put("/v1/message-threads/:messageThreadID", h.computeRoute(middlewares, h.Update)...)
- router.Delete("/v1/message-threads/:messageThreadID", h.computeRoute(middlewares, h.Delete)...)
+ h.register(router, fiber.MethodGet, "/v1/message-threads", middlewares, h.Index)
+ h.register(router, fiber.MethodPut, "/v1/message-threads/:messageThreadID", middlewares, h.Update)
+ h.register(router, fiber.MethodDelete, "/v1/message-threads/:messageThreadID", middlewares, h.Delete)
}
// Index returns message threads for a phone number
diff --git a/api/pkg/handlers/phone_api_key_handler.go b/api/pkg/handlers/phone_api_key_handler.go
index 794779da..5757c315 100644
--- a/api/pkg/handlers/phone_api_key_handler.go
+++ b/api/pkg/handlers/phone_api_key_handler.go
@@ -45,10 +45,10 @@ func NewPhoneAPIKeyHandler(
// RegisterRoutes registers the routes for the PhoneAPIKeyHandler
func (h *PhoneAPIKeyHandler) RegisterRoutes(app *fiber.App, middlewares ...fiber.Handler) {
router := app.Group("/v1/phone-api-keys/")
- router.Get("/", h.computeRoute(middlewares, h.index)...)
- router.Post("/", h.computeRoute(middlewares, h.store)...)
- router.Delete("/:phoneAPIKeyID", h.computeRoute(middlewares, h.delete)...)
- router.Delete("/:phoneAPIKeyID/phones/:phoneID", h.computeRoute(middlewares, h.deletePhone)...)
+ h.register(router, fiber.MethodGet, "/", middlewares, h.index)
+ h.register(router, fiber.MethodPost, "/", middlewares, h.store)
+ h.register(router, fiber.MethodDelete, "/:phoneAPIKeyID", middlewares, h.delete)
+ h.register(router, fiber.MethodDelete, "/:phoneAPIKeyID/phones/:phoneID", middlewares, h.deletePhone)
}
// @Summary Get the phone API keys of a user
diff --git a/api/pkg/handlers/phone_handler.go b/api/pkg/handlers/phone_handler.go
index 4d445fd8..7c0769da 100644
--- a/api/pkg/handlers/phone_handler.go
+++ b/api/pkg/handlers/phone_handler.go
@@ -40,14 +40,14 @@ func NewPhoneHandler(
// RegisterRoutes registers the routes for the PhoneHandler
func (h *PhoneHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/phones", h.computeRoute(middlewares, h.Index)...)
- router.Put("/v1/phones", h.computeRoute(middlewares, h.Upsert)...)
- router.Delete("/v1/phones/:phoneID", h.computeRoute(middlewares, h.Delete)...)
+ h.register(router, fiber.MethodGet, "/v1/phones", middlewares, h.Index)
+ h.register(router, fiber.MethodPut, "/v1/phones", middlewares, h.Upsert)
+ h.register(router, fiber.MethodDelete, "/v1/phones/:phoneID", middlewares, h.Delete)
}
// RegisterPhoneAPIKeyRoutes registers the routes for the PhoneHandler
func (h *PhoneHandler) RegisterPhoneAPIKeyRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Put("/v1/phones/fcm-token", h.computeRoute(middlewares, h.UpsertFCMToken)...)
+ h.register(router, fiber.MethodPut, "/v1/phones/fcm-token", middlewares, h.UpsertFCMToken)
}
// Index returns the phones of a user
diff --git a/api/pkg/handlers/user_handler.go b/api/pkg/handlers/user_handler.go
index e89b6786..9b73f742 100644
--- a/api/pkg/handlers/user_handler.go
+++ b/api/pkg/handlers/user_handler.go
@@ -39,15 +39,15 @@ func NewUserHandler(
// RegisterRoutes registers the routes for the MessageHandler
func (h *UserHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/users/me", h.computeRoute(middlewares, h.Show)...)
- router.Put("/v1/users/me", h.computeRoute(middlewares, h.Update)...)
- router.Delete("/v1/users/me", h.computeRoute(middlewares, h.Delete)...)
- router.Delete("/v1/users/:userID/api-keys", h.computeRoute(middlewares, h.DeleteAPIKey)...)
- router.Put("/v1/users/:userID/notifications", h.computeRoute(middlewares, h.UpdateNotifications)...)
- router.Get("/v1/users/subscription-update-url", h.computeRoute(middlewares, h.subscriptionUpdateURL)...)
- router.Delete("/v1/users/subscription", h.computeRoute(middlewares, h.cancelSubscription)...)
- router.Get("/v1/users/subscription/payments", h.computeRoute(middlewares, h.subscriptionPayments)...)
- router.Post("/v1/users/subscription/invoices/:subscriptionInvoiceID", h.computeRoute(middlewares, h.subscriptionInvoice)...)
+ h.register(router, fiber.MethodGet, "/v1/users/me", middlewares, h.Show)
+ h.register(router, fiber.MethodPut, "/v1/users/me", middlewares, h.Update)
+ h.register(router, fiber.MethodDelete, "/v1/users/me", middlewares, h.Delete)
+ h.register(router, fiber.MethodDelete, "/v1/users/:userID/api-keys", middlewares, h.DeleteAPIKey)
+ h.register(router, fiber.MethodPut, "/v1/users/:userID/notifications", middlewares, h.UpdateNotifications)
+ h.register(router, fiber.MethodGet, "/v1/users/subscription-update-url", middlewares, h.subscriptionUpdateURL)
+ h.register(router, fiber.MethodDelete, "/v1/users/subscription", middlewares, h.cancelSubscription)
+ h.register(router, fiber.MethodGet, "/v1/users/subscription/payments", middlewares, h.subscriptionPayments)
+ h.register(router, fiber.MethodPost, "/v1/users/subscription/invoices/:subscriptionInvoiceID", middlewares, h.subscriptionInvoice)
}
// Show returns an entities.User
diff --git a/api/pkg/handlers/webhook_handler.go b/api/pkg/handlers/webhook_handler.go
index 3ad82a13..c3eab855 100644
--- a/api/pkg/handlers/webhook_handler.go
+++ b/api/pkg/handlers/webhook_handler.go
@@ -42,10 +42,10 @@ func NewWebhookHandler(
// RegisterRoutes registers the routes for the WebhookHandler
func (h *WebhookHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber.Handler) {
- router.Get("/v1/webhooks", h.computeRoute(middlewares, h.Index)...)
- router.Post("/v1/webhooks", h.computeRoute(middlewares, h.Store)...)
- router.Put("/v1/webhooks/:webhookID", h.computeRoute(middlewares, h.Update)...)
- router.Delete("/v1/webhooks/:webhookID", h.computeRoute(middlewares, h.Delete)...)
+ h.register(router, fiber.MethodGet, "/v1/webhooks", middlewares, h.Index)
+ h.register(router, fiber.MethodPost, "/v1/webhooks", middlewares, h.Store)
+ h.register(router, fiber.MethodPut, "/v1/webhooks/:webhookID", middlewares, h.Update)
+ h.register(router, fiber.MethodDelete, "/v1/webhooks/:webhookID", middlewares, h.Delete)
}
// Index returns the webhooks of a user