asd

Author: dbarrosop

.golangci.yaml

@@ -29,6 +29,7 @@ linters:
       - linters:
           - funlen
           - ireturn
+          - goconst
         path: _test\.go
       - linters:
           - lll

go/cmd/email.go

@@ -111,6 +111,26 @@ func getSMS( //nolint:ireturn
 		return nil, nil //nolint:nilnil // SMS disabled, return nil client
 	}
 
+	provider := strings.ToLower(cCtx.String(flagSMSProvider))
+	if provider == "" {
+		provider = "twilio" // Default to Twilio for backward compatibility
+	}
+
+	switch strings.ToLower(cCtx.String(flagSMSProvider)) {
+	case "twilio":
+		return getTwilioSMS(cCtx, templates, db)
+	case "dev":
+		return sms.NewDev(templates, db, logger), nil
+	default:
+		return nil, fmt.Errorf("unsupported SMS provider: %s", provider) //nolint:err113
+	}
+}
+
+func getTwilioSMS( //nolint:ireturn
+	cCtx *cli.Context,
+	templates *notifications.Templates,
+	db *sql.Queries,
+) (controller.SMSer, error) {
 	accountSid := cCtx.String(flagSMSTwilioAccountSid)
 	authToken := cCtx.String(flagSMSTwilioAuthToken)
 	messagingServiceID := cCtx.String(flagSMSTwilioMessagingServiceID)
@@ -126,19 +146,8 @@ func getSMS( //nolint:ireturn
 		), nil
 	}
 
-	if templates == nil {
-		var err error
-
-		templates, err = getTemplates(cCtx, logger)
-		if err != nil {
-			return nil, fmt.Errorf("problem creating templates: %w", err)
-		}
-	}
-
 	return sms.NewTwilioSMS(
 		templates,
-		controller.GenerateOTP,
-		controller.HashOTP,
 		accountSid,
 		authToken,
 		messagingServiceID,

go/cmd/serve.go

@@ -95,6 +95,7 @@ const (
 	flagGoogleAudience                   = "google-audience"
 	flagOTPEmailEnabled                  = "otp-email-enabled"
 	flagSMSPasswordlessEnabled           = "sms-passwordless-enabled"
+	flagSMSProvider                      = "sms-provider"
 	flagSMSTwilioAccountSid              = "sms-twilio-account-sid"
 	flagSMSTwilioAuthToken               = "sms-twilio-auth-token" //nolint:gosec
 	flagSMSTwilioMessagingServiceID      = "sms-twilio-messaging-service-id"
@@ -666,6 +667,13 @@ func CommandServe() *cli.Command { //nolint:funlen,maintidx
 				Category: "sms",
 				EnvVars:  []string{"AUTH_SMS_PASSWORDLESS_ENABLED"},
 			},
+			&cli.StringFlag{ //nolint: exhaustruct
+				Name:     flagSMSProvider,
+				Usage:    "SMS provider (twilio or modica)",
+				Category: "sms",
+				EnvVars:  []string{"AUTH_SMS_PROVIDER"},
+				Value:    "twilio",
+			},
 			&cli.StringFlag{ //nolint: exhaustruct
 				Name:     flagSMSTwilioAccountSid,
 				Usage:    "Twilio Account SID for SMS",

go/controller/controller.go

@@ -58,9 +58,6 @@ type DBClientGetUser interface {
 	GetUserByEmailAndTicket(
 		ctx context.Context, arg sql.GetUserByEmailAndTicketParams,
 	) (sql.AuthUser, error)
-	GetUserByPhoneNumberAndOTP(
-		ctx context.Context, arg sql.GetUserByPhoneNumberAndOTPParams,
-	) (sql.AuthUser, error)
 }
 
 type DBClientInsertUser interface {

go/controller/elevate_webauthn_test.go

@@ -46,7 +46,7 @@ func TestElevateWebauthn(t *testing.T) {
 		}
 	}
 
-	credentialIDString := "EuKJAraRGDcmHon-EjDoqoU5Yvk" //nolint:gosec,goconst
+	credentialIDString := "EuKJAraRGDcmHon-EjDoqoU5Yvk" //nolint:gosec
 
 	var credentialID protocol.URLEncodedBase64
 	if err := credentialID.UnmarshalJSON([]byte(credentialIDString)); err != nil {

go/controller/mock/controller.go

@@ -55,7 +55,7 @@ func TestRefreshToken(t *testing.T) { //nolint:maintidx
 
 	userID := uuid.MustParse("db477732-48fa-4289-b694-2886a646b6eb")
 	token := uuid.MustParse("1fb17604-86c7-444e-b337-09a644465f2d")
-	hashedToken := `\x9698157153010b858587119503cbeef0cf288f11775e51cdb6bfd65e930d9310` //nolint:goconst
+	hashedToken := `\x9698157153010b858587119503cbeef0cf288f11775e51cdb6bfd65e930d9310`
 	newTokenID := uuid.MustParse("1fb13604-86c7-4444-a337-09a644465f2d")
 
 	cases := []testRequest[api.RefreshTokenRequestObject, api.RefreshTokenResponseObject]{

go/controller/refresh_token_test.go

@@ -8,7 +8,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-func verifyHashPassword(password, hash string) bool {
+func VerifyHashPassword(password, hash string) bool {
 	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
 	return err == nil
 }

go/controller/secrets.go

@@ -41,7 +41,7 @@ func (ctrl *Controller) SignInEmailPassword( //nolint:ireturn
 		return ctrl.respondWithError(apiErr), nil
 	}
 
-	if !verifyHashPassword(request.Body.Password, user.PasswordHash.String) {
+	if !VerifyHashPassword(request.Body.Password, user.PasswordHash.String) {
 		logger.WarnContext(ctx, "password doesn't match")
 		return ctrl.sendError(ErrInvalidEmailPassword), nil
 	}

go/controller/sign_in_email_password.go

@@ -2,14 +2,26 @@ package controller
 
 import (
 	"context"
+	"crypto/rand"
+	"fmt"
 	"log/slog"
+	"math/big"
 	"time"
 
 	"github.com/nhost/hasura-auth/go/api"
 	"github.com/nhost/hasura-auth/go/middleware"
 	"github.com/nhost/hasura-auth/go/notifications"
 )
 
+func generateOTP() (string, error) {
+	n, err := rand.Int(rand.Reader, big.NewInt(1000000)) //nolint:mnd
+	if err != nil {
+		return "", fmt.Errorf("error generating OTP: %w", err)
+	}
+
+	return fmt.Sprintf("%06d", n), nil
+}
+
 func (ctrl *Controller) SignInOTPEmail( //nolint:ireturn
 	ctx context.Context,
 	request api.SignInOTPEmailRequestObject,
@@ -28,7 +40,7 @@ func (ctrl *Controller) SignInOTPEmail( //nolint:ireturn
 		return ctrl.respondWithError(apiErr), nil
 	}
 
-	otp, _, err := GenerateOTP()
+	otp, err := generateOTP()
 	if err != nil {
 		logger.ErrorContext(ctx, "error generating OTP", logError(err))
 		return ctrl.sendError(ErrInternalServerError), nil