[internal] use new jwt and users packages

Author: capcom6

.golangci.yml

@@ -252,12 +252,12 @@ linters:
         - ^os/exec.Cmd$
         - ^reflect.StructField$
         # public libs
-        - "^github.com/gofiber/.+Config$"
-        - "^gopkg.in/telebot.v4.LongPoller$"
-        - "^gopkg.in/telebot.v4.ReplyMarkup$"
-        - "^gopkg.in/telebot.v4.Settings$"
+        - ^firebase.google.com/go/v4/messaging.AndroidConfig$
+        - ^firebase.google.com/go/v4/messaging.Message$
         - ^github.com/aws/aws-sdk-go-v2/service/s3.+Input$
         - ^github.com/aws/aws-sdk-go-v2/service/s3/types.ObjectIdentifier$
+        - ^github.com/gofiber/.+Config$
+        - ^github.com/golang-jwt/jwt/v5.+Claims$
         - ^github.com/mitchellh/mapstructure.DecoderConfig$
         - ^github.com/prometheus/client_golang/.+Opts$
         - ^github.com/secsy/goftp.Config$
@@ -273,10 +273,11 @@ linters:
         - ^github.com/urfave/cli.v3.FlagBase$
         - ^golang.org/x/tools/go/analysis.Analyzer$
         - ^google.golang.org/protobuf/.+Options$
+        - ^gopkg.in/telebot.v4.LongPoller$
+        - ^gopkg.in/telebot.v4.ReplyMarkup$
+        - ^gopkg.in/telebot.v4.Settings$
         - ^gopkg.in/yaml.v3.Node$
         - ^gorm.io/gorm/clause.+$
-        - ^firebase.google.com/go/v4/messaging.Message$
-        - ^firebase.google.com/go/v4/messaging.AndroidConfig$
       # Allows empty structures in return statements.
       # Default: false
       allow-empty-returns: true

cmd/sms-gateway/main.go

@@ -14,6 +14,11 @@ const (
 //	@securitydefinitions.basic	ApiAuth
 //	@description				User authentication
 
+//	@securitydefinitions.apikey	JWTAuth
+//	@in							header
+//	@name						Authorization
+//	@description				JWT authentication
+
 //	@securitydefinitions.apikey	UserCode
 //	@in							header
 //	@name						Authorization

configs/config.example.yml

@@ -38,15 +38,19 @@ cache: # cache config
   url: memory:// # cache url (memory:// or redis://) [CACHE__URL]
 pubsub: # pubsub config
   url: memory:// # pubsub url (memory:// or redis://) [PUBSUB__URL]
+jwt:
+  secret: # jwt secret (leave empty to disable JWT functionality) [JWT__SECRET]
+  ttl: 24h # jwt ttl [JWT__TTL]
+  issuer: # jwt issuer [JWT__ISSUER]
 
 ## Worker Config ##
 
 tasks: # tasks config
   messages_hashing:
-    interval: 168h # task execution interval in hours [TASKS__MESSAGES_HASHING__INTERVAL]
+    interval: 168h # task execution interval [TASKS__MESSAGES_HASHING__INTERVAL]
   messages_cleanup:
-    interval: 24h # task execution interval in hours [TASKS__MESSAGES_CLEANUP__INTERVAL]
-    max_age: 720h # messages max age in hours [TASKS__MESSAGES_CLEANUP__MAX_AGE]
+    interval: 24h # task execution interval [TASKS__MESSAGES_CLEANUP__INTERVAL]
+    max_age: 720h # messages max age [TASKS__MESSAGES_CLEANUP__MAX_AGE]
   devices_cleanup:
-    interval: 24h # task execution interval in hours [TASKS__DEVICES_CLEANUP__INTERVAL]
-    max_age: 8760h # inactive devices max age in hours [TASKS__DEVICES_CLEANUP__MAX_AGE]
+    interval: 24h # task execution interval [TASKS__DEVICES_CLEANUP__INTERVAL]
+    max_age: 8760h # inactive devices max age [TASKS__DEVICES_CLEANUP__MAX_AGE]

go.mod

@@ -4,7 +4,7 @@ go 1.24.3
 
 require (
 	firebase.google.com/go/v4 v4.12.1
-	github.com/android-sms-gateway/client-go v1.9.5
+	github.com/android-sms-gateway/client-go v1.9.6-0.20251123133512-f7816d96f90a
 	github.com/ansrivas/fiberprometheus/v2 v2.6.1
 	github.com/capcom6/go-helpers v0.3.0
 	github.com/capcom6/go-infra-fx v0.5.2

go.sum

@@ -34,6 +34,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/android-sms-gateway/client-go v1.9.5 h1:fHrE1Pi3rKUdPVMmI9evKW0iyjB5bMIhFRxyq1wVQ+o=
 github.com/android-sms-gateway/client-go v1.9.5/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
+github.com/android-sms-gateway/client-go v1.9.6-0.20251123133512-f7816d96f90a h1:Tm1FDTqFRs1ZftaEmQqDdIXtMRZf2aGCp8t2BgXY/rs=
+github.com/android-sms-gateway/client-go v1.9.6-0.20251123133512-f7816d96f90a/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/ansrivas/fiberprometheus/v2 v2.6.1 h1:wac3pXaE6BYYTF04AC6K0ktk6vCD+MnDOJZ3SK66kXM=

internal/config/config.go

@@ -1,5 +1,7 @@
 package config
 
+import "time"
+
 type GatewayMode string
 
 const (
@@ -17,6 +19,7 @@ type Config struct {
 	Messages Messages  `yaml:"messages"` // messages config
 	Cache    Cache     `yaml:"cache"`    // cache (memory or redis) config
 	PubSub   PubSub    `yaml:"pubsub"`   // pubsub (memory or redis) config
+	JWT      JWT       `yaml:"jwt"`      // jwt config
 }
 
 type Gateway struct {
@@ -86,6 +89,12 @@ type PubSub struct {
 	BufferSize uint   `yaml:"buffer_size" envconfig:"PUBSUB__BUFFER_SIZE"`
 }
 
+type JWT struct {
+	Secret string   `yaml:"secret" envconfig:"JWT__SECRET"`
+	TTL    Duration `yaml:"ttl"    envconfig:"JWT__TTL"`
+	Issuer string   `yaml:"issuer" envconfig:"JWT__ISSUER"`
+}
+
 func Default() Config {
 	//nolint:exhaustruct,mnd // default values
 	return Config{
@@ -123,5 +132,9 @@ func Default() Config {
 			URL:        "memory://",
 			BufferSize: 128,
 		},
+		JWT: JWT{
+			TTL:    Duration(time.Hour * 24),
+			Issuer: "sms-gate.app",
+		},
 	}
 }

internal/config/module.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/android-sms-gateway/server/internal/sms-gateway/cache"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/jwt"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
@@ -136,5 +137,12 @@ func Module() fx.Option {
 				BufferSize: cfg.PubSub.BufferSize,
 			}
 		}),
+		fx.Provide(func(cfg Config) jwt.Config {
+			return jwt.Config{
+				Secret: cfg.JWT.Secret,
+				TTL:    time.Duration(cfg.JWT.TTL),
+				Issuer: cfg.JWT.Issuer,
+			}
+		}),
 	)
 }

internal/config/types.go

@@ -0,0 +1,48 @@
+package config
+
+import (
+	"encoding"
+	"fmt"
+	"time"
+
+	"gopkg.in/yaml.v3"
+)
+
+type Duration time.Duration
+
+// Duration returns the underlying time.Duration value.
+func (d *Duration) Duration() time.Duration {
+	if d == nil {
+		return 0
+	}
+	return time.Duration(*d)
+}
+
+// String returns the string representation of the duration.
+func (d *Duration) String() string {
+	if d == nil {
+		return ""
+	}
+	return time.Duration(*d).String()
+}
+
+func (d *Duration) UnmarshalText(text []byte) error {
+	t, err := time.ParseDuration(string(text))
+	if err != nil {
+		return fmt.Errorf("can't parse duration: %w", err)
+	}
+	*d = Duration(t)
+	return nil
+}
+
+func (d *Duration) UnmarshalYAML(value *yaml.Node) error {
+	var s string
+	if err := value.Decode(&s); err != nil {
+		return fmt.Errorf("can't unmarshal duration: %w", err)
+	}
+
+	return d.UnmarshalText([]byte(s))
+}
+
+var _ yaml.Unmarshaler = (*Duration)(nil)
+var _ encoding.TextUnmarshaler = (*Duration)(nil)

internal/sms-gateway/app.go

@@ -7,6 +7,7 @@ import (
 	appconfig "github.com/android-sms-gateway/server/internal/config"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/cache"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/jwt"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
 	appdb "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
@@ -20,6 +21,7 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/online"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/openapi"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/pubsub"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/users"
 	"github.com/android-sms-gateway/server/pkg/health"
 	"github.com/capcom6/go-infra-fx/cli"
 	"github.com/capcom6/go-infra-fx/db"
@@ -40,6 +42,7 @@ func Module() fx.Option {
 		validator.Module,
 		openapi.Module(),
 		handlers.Module(),
+		users.Module(),
 		auth.Module(),
 		push.Module(),
 		db.Module,
@@ -54,6 +57,7 @@ func Module() fx.Option {
 		metrics.Module(),
 		sse.Module(),
 		online.Module(),
+		jwt.Module(),
 	)
 }
 

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

@@ -5,43 +5,65 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/devices"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/logs"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/messages"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/middlewares/jwtauth"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/middlewares/userauth"
 	"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/jwt"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/users"
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
-	"go.uber.org/fx"
 	"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
-
-	AuthSvc *auth.Service
-
-	Logger    *zap.Logger
-	Validator *validator.Validate
-}
-
 type thirdPartyHandler struct {
 	base.Handler
 
+	usersSvc *users.Service
+	jwtSvc   jwt.Service
+
 	healthHandler   *HealthHandler
 	messagesHandler *messages.ThirdPartyController
 	webhooksHandler *webhooks.ThirdPartyController
 	devicesHandler  *devices.ThirdPartyController
 	settingsHandler *settings.ThirdPartyController
 	logsHandler     *logs.ThirdPartyController
+	authHandler     *thirdparty.AuthHandler
+}
 
-	authSvc *auth.Service
+func newThirdPartyHandler(
+	usersSvc *users.Service,
+	jwtService jwt.Service,
+
+	healthHandler *HealthHandler,
+	messagesHandler *messages.ThirdPartyController,
+	webhooksHandler *webhooks.ThirdPartyController,
+	devicesHandler *devices.ThirdPartyController,
+	settingsHandler *settings.ThirdPartyController,
+	logsHandler *logs.ThirdPartyController,
+	authHandler *thirdparty.AuthHandler,
+
+	logger *zap.Logger,
+	validator *validator.Validate,
+) *thirdPartyHandler {
+	return &thirdPartyHandler{
+		Handler: base.Handler{
+			Logger:    logger,
+			Validator: validator,
+		},
+
+		usersSvc: usersSvc,
+		jwtSvc:   jwtService,
+
+		healthHandler:   healthHandler,
+		messagesHandler: messagesHandler,
+		webhooksHandler: webhooksHandler,
+		devicesHandler:  devicesHandler,
+		settingsHandler: settingsHandler,
+		logsHandler:     logsHandler,
+		authHandler:     authHandler,
+	}
 }
 
 func (h *thirdPartyHandler) Register(router fiber.Router) {
@@ -50,10 +72,13 @@ func (h *thirdPartyHandler) Register(router fiber.Router) {
 	h.healthHandler.Register(router)
 
 	router.Use(
-		userauth.NewBasic(h.authSvc),
+		userauth.NewBasic(h.usersSvc),
+		jwtauth.NewJWT(h.jwtSvc, h.usersSvc),
 		userauth.UserRequired(),
 	)
 
+	h.authHandler.Register(router.Group("/auth"))
+
 	h.messagesHandler.Register(router.Group("/message")) // TODO: remove after 2025-12-31
 	h.messagesHandler.Register(router.Group("/messages"))
 
@@ -66,16 +91,3 @@ func (h *thirdPartyHandler) Register(router fiber.Router) {
 
 	h.logsHandler.Register(router.Group("/logs"))
 }
-
-func newThirdPartyHandler(params ThirdPartyHandlerParams) *thirdPartyHandler {
-	return &thirdPartyHandler{
-		Handler:         base.Handler{Logger: params.Logger.Named("ThirdPartyHandler"), Validator: params.Validator},
-		healthHandler:   params.HealthHandler,
-		messagesHandler: params.MessagesHandler,
-		webhooksHandler: params.WebhooksHandler,
-		devicesHandler:  params.DevicesHandler,
-		settingsHandler: params.SettingsHandler,
-		logsHandler:     params.LogsHandler,
-		authSvc:         params.AuthSvc,
-	}
-}