[handlers] cleanup

Author: capcom6

internal/sms-gateway/handlers/3rdparty.go

@@ -9,34 +9,15 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/settings"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/thirdparty"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks"
-	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/users"
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 )
 
-// type ThirdPartyHandlerParams struct {
-// 	fx.In
-
-// 	HealthHandler   *HealthHandler
-// 	MessagesHandler *messages.ThirdPartyController
-// 	WebhooksHandler *webhooks.ThirdPartyController
-// 	DevicesHandler  *devices.ThirdPartyController
-// 	SettingsHandler *settings.ThirdPartyController
-// 	LogsHandler     *logs.ThirdPartyController
-// 	AuthHandler     *thirdparty.AuthHandler
-
-// 	AuthSvc *auth.Service
-
-// 	Logger    *zap.Logger
-// 	Validator *validator.Validate
-// }
-
 type thirdPartyHandler struct {
 	base.Handler
 
-	authSvc  *auth.Service
 	usersSvc *users.Service
 
 	healthHandler   *HealthHandler
@@ -49,7 +30,6 @@ type thirdPartyHandler struct {
 }
 
 func newThirdPartyHandler(
-	authSvc *auth.Service,
 	usersSvc *users.Service,
 
 	healthHandler *HealthHandler,
@@ -69,7 +49,6 @@ func newThirdPartyHandler(
 			Validator: validator,
 		},
 
-		authSvc:  authSvc,
 		usersSvc: usersSvc,
 
 		healthHandler:   healthHandler,

internal/sms-gateway/handlers/middlewares/userauth/userauth.go

@@ -50,7 +50,7 @@ func NewBasic(usersSvc *users.Service) fiber.Handler {
 			return fiber.ErrUnauthorized
 		}
 
-		c.Locals(localsUser, *user)
+		setUser(c, *user)
 
 		return c.Next()
 	}
@@ -77,12 +77,16 @@ func NewCode(authSvc *auth.Service) fiber.Handler {
 			return fiber.ErrUnauthorized
 		}
 
-		c.Locals(localsUser, user)
+		setUser(c, *user)
 
 		return c.Next()
 	}
 }
 
+func setUser(c *fiber.Ctx, user users.User) {
+	c.Locals(localsUser, user)
+}
+
 // HasUser checks if a user is present in the Locals of the given context.
 // It returns true if the Locals contain a user under the key LocalsUser,
 // otherwise returns false.

internal/sms-gateway/handlers/mobile.go

@@ -25,21 +25,6 @@ import (
 	"go.uber.org/zap"
 )
 
-// type mobileHandlerParams struct {
-// 	fx.In
-
-// 	Logger    *zap.Logger
-// 	Validator *validator.Validate
-
-// 	AuthSvc    *auth.Service
-// 	DevicesSvc *devices.Service
-
-// 	MessagesCtrl *messages.MobileController
-// 	WebhooksCtrl *webhooks.MobileController
-// 	SettingsCtrl *settings.MobileController
-// 	EventsCtrl   *events.MobileController
-// }
-
 type mobileHandler struct {
 	base.Handler
 
@@ -139,8 +124,8 @@ func (h *mobileHandler) postDevice(c *fiber.Ctx) (err error) {
 		password string
 	)
 
-	if userauth.HasUser(c) {
-		user = userauth.GetUser(c)
+	if authUser := userauth.GetUser(c); authUser != nil {
+		user = authUser
 		username = user.ID
 	} else {
 		id := h.idGen()