From d470b024b4033b30c402b10dd383a15c3bac1bf1 Mon Sep 17 00:00:00 2001 From: Yared Yemane Date: Thu, 5 Mar 2026 01:30:33 -0800 Subject: [PATCH] removed twilio --- go.mod | 4 -- go.sum | 15 ----- internal/config/config.go | 25 +------- internal/domain/sms.go | 3 +- internal/services/messenger/sms.go | 78 +---------------------- internal/services/notification/service.go | 36 +---------- internal/services/user/common.go | 15 +---- internal/services/user/register.go | 2 +- 8 files changed, 9 insertions(+), 169 deletions(-) diff --git a/go.mod b/go.mod index db278e0..782f5cf 100644 --- a/go.mod +++ b/go.mod @@ -6,14 +6,12 @@ toolchain go1.24.11 require ( firebase.google.com/go/v4 v4.19.0 - github.com/amanuelabay/afrosms-go v1.0.6 github.com/go-playground/validator/v10 v10.29.0 github.com/joho/godotenv v1.5.1 github.com/resend/resend-go/v2 v2.28.0 github.com/shopspring/decimal v1.4.0 github.com/swaggo/fiber-swagger v1.3.0 github.com/swaggo/swag v1.16.6 - github.com/twilio/twilio-go v1.30.0 golang.org/x/crypto v0.47.0 golang.org/x/oauth2 v0.34.0 google.golang.org/api v0.239.0 @@ -113,7 +111,6 @@ require ( github.com/bytedance/sonic v1.14.2 github.com/gofiber/fiber/v2 v2.52.10 github.com/golang-jwt/jwt/v5 v5.3.0 - github.com/golang/mock v1.6.0 // indirect github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 // github.com/jackc/pgtype v1.14.4 @@ -122,7 +119,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.51.0 diff --git a/go.sum b/go.sum index cd871f1..e690e42 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY= -github.com/amanuelabay/afrosms-go v1.0.6 h1:/B9upckMqzr5/de7dbXPqIfmJm4utbQq0QUQePxmXtk= -github.com/amanuelabay/afrosms-go v1.0.6/go.mod h1:5mzzZtWSCDdvQsA0OyYf5CtbdGpl9lXyrcpl8/DyBj0= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= @@ -111,8 +109,6 @@ github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXe github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= @@ -161,8 +157,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275 h1:IZycmTpoUtQK3PD60UYBwjaCUHUP7cML494ao9/O8+Q= -github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275/go.mod h1:zt6UU74K6Z6oMOYJbJzYpYucqdcQwSMPBEdSvGiaUMw= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= @@ -182,8 +176,6 @@ github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -223,8 +215,6 @@ github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9J github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ= github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI= github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg= -github.com/twilio/twilio-go v1.30.0 h1:86FBso7jFqpSZ0XC0GKJcEY2KOeUNOFh6zLhTbUMlnc= -github.com/twilio/twilio-go v1.30.0/go.mod h1:QbitvbvtkV77Jn4BABAKVmxabYSjMyQG4tHey9gfPqg= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= @@ -244,7 +234,6 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM= @@ -293,7 +282,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -311,10 +299,8 @@ golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -339,7 +325,6 @@ golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= diff --git a/internal/config/config.go b/internal/config/config.go index 733e3f6..b785f33 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -27,9 +27,7 @@ var ( ErrMissingResendApiKey = errors.New("missing Resend Api key") ErrMissingResendSenderEmail = errors.New("missing Resend sender name") - ErrMissingTwilioAccountSid = errors.New("missing twilio account sid") - ErrMissingTwilioAuthToken = errors.New("missing twilio auth token") - ErrMissingTwilioSenderPhoneNumber = errors.New("missing twilio sender phone number") + ) type AFROSMSConfig struct { @@ -127,9 +125,6 @@ type Config struct { TELEBIRR TELEBIRRConfig `mapstructure:"telebirr_config"` ResendApiKey string ResendSenderEmail string - TwilioAccountSid string - TwilioAuthToken string - TwilioSenderPhoneNumber string RedisAddr string KafkaBrokers []string FCMServiceAccountKey string @@ -462,24 +457,6 @@ func (c *Config) loadEnv() error { } c.ResendSenderEmail = resendSenderEmail - twilioAccountSid := os.Getenv("TWILIO_ACCOUNT_SID") - if twilioAccountSid == "" { - return ErrMissingTwilioAccountSid - } - c.TwilioAccountSid = twilioAccountSid - - twilioAuthToken := os.Getenv("TWILIO_AUTH_TOKEN") - if twilioAuthToken == "" { - return ErrMissingTwilioAuthToken - } - c.TwilioAuthToken = twilioAuthToken - - twilioSenderPhoneNumber := os.Getenv("TWILIO_SENDER_PHONE_NUMBER") - if twilioSenderPhoneNumber == "" { - return ErrMissingTwilioSenderPhoneNumber - } - c.TwilioSenderPhoneNumber = twilioSenderPhoneNumber - c.FCMServiceAccountKey = os.Getenv("FCM_SERVICE_ACCOUNT_KEY") // Vimeo configuration diff --git a/internal/domain/sms.go b/internal/domain/sms.go index 48088c4..fabec51 100644 --- a/internal/domain/sms.go +++ b/internal/domain/sms.go @@ -3,14 +3,13 @@ package domain type SMSProvider string const ( - TwilioSms SMSProvider = "twilio" AfroMessage SMSProvider = "afro_message" ) // IsValid checks if the SMSProvider is a valid enum value func (s SMSProvider) IsValid() bool { switch s { - case TwilioSms, AfroMessage: + case AfroMessage: return true default: return false diff --git a/internal/services/messenger/sms.go b/internal/services/messenger/sms.go index 595c513..0d1cca2 100644 --- a/internal/services/messenger/sms.go +++ b/internal/services/messenger/sms.go @@ -1,68 +1,17 @@ package messenger import ( - "Yimaru-Backend/internal/domain" "context" "encoding/json" - "errors" "fmt" "io" "net/http" "net/url" "time" - - afro "github.com/amanuelabay/afrosms-go" - "github.com/twilio/twilio-go" - twilioApi "github.com/twilio/twilio-go/rest/api/v2010" ) -var ( - ErrSMSProviderNotFound = errors.New("SMS Provider Not Found") -) - -// If the company id is valid, it is a company based notification else its a global notification (by the super admin) func (s *Service) SendSMS(ctx context.Context, receiverPhone, message string) error { - - var settingsList domain.SettingList - - switch settingsList.SMSProvider { - case domain.AfroMessage: - return s.SendAfroMessageSMS(ctx, receiverPhone, message) - case domain.TwilioSms: - return s.SendTwilioSMS(ctx, receiverPhone, message) - default: - return ErrSMSProviderNotFound - } -} - -func (s *Service) SendAfroMessageSMS(ctx context.Context, receiverPhone, message string) error { - apiKey := s.config.AFRO_SMS_API_KEY - senderName := s.config.AFRO_SMS_SENDER_NAME - hostURL := s.config.AFRO_SMS_HOST_URL - endpoint := "/api/send" - - // API endpoint has been updated - // TODO: no need for package for the afro message operations (pretty simple stuff) - request := afro.GetRequest(apiKey, endpoint, hostURL) - request.BaseURL = "https://api.afromessage.com" - - request.Method = "GET" - request.Sender(senderName) - request.To(receiverPhone, message) - - fmt.Printf("the afro SMS request is: %v", request) - - response, err := afro.MakeRequestWithContext(ctx, request) - if err != nil { - return err - } - - if response["acknowledge"] == "success" { - return nil - } else { - fmt.Println(response["response"].(map[string]interface{})) - return errors.New("SMS delivery failed") - } + return s.SendAfroMessageSMSLatest(ctx, receiverPhone, message, nil) } func (s *Service) SendAfroMessageSMSLatest( @@ -90,7 +39,7 @@ func (s *Service) SendAfroMessageSMSLatest( } // Construct full URL - reqURL := fmt.Sprintf("%s?%s", baseURL+"/api/send", params.Encode()) + reqURL := fmt.Sprintf("%s/api/send?%s", baseURL, params.Encode()) req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil) if err != nil { @@ -137,26 +86,3 @@ func (s *Service) SendAfroMessageSMSLatest( return nil } - -func (s *Service) SendTwilioSMS(ctx context.Context, receiverPhone, message string) error { - accountSid := s.config.TwilioAccountSid - authToken := s.config.TwilioAuthToken - senderPhone := s.config.TwilioSenderPhoneNumber - - client := twilio.NewRestClientWithParams(twilio.ClientParams{ - Username: accountSid, - Password: authToken, - }) - - params := &twilioApi.CreateMessageParams{} - params.SetTo(receiverPhone) - params.SetFrom(senderPhone) - params.SetBody(message) - - _, err := client.Api.CreateMessage(params) - if err != nil { - return fmt.Errorf("%s", "Error sending SMS message: %s"+err.Error()) - } - - return nil -} diff --git a/internal/services/notification/service.go b/internal/services/notification/service.go index ddd5c54..e2c3a38 100644 --- a/internal/services/notification/service.go +++ b/internal/services/notification/service.go @@ -23,10 +23,8 @@ import ( // "github.com/segmentio/kafka-go" "go.uber.org/zap" - // afro "github.com/amanuelabay/afrosms-go" firebase "firebase.google.com/go/v4" "firebase.google.com/go/v4/messaging" - afro "github.com/amanuelabay/afrosms-go" "github.com/gorilla/websocket" "github.com/resend/resend-go/v2" "google.golang.org/api/option" @@ -112,38 +110,6 @@ func (s *Service) initFCMClient() error { return nil } -func (s *Service) SendAfroMessageSMS(ctx context.Context, receiverPhone, message string) error { - apiKey := s.config.AFRO_SMS_API_KEY - senderName := s.config.AFRO_SMS_SENDER_NAME - - baseURL := "https://api.afromessage.com" - endpoint := "/api/send" - - request := afro.GetRequest(apiKey, endpoint, baseURL) - - // MUST be POST - request.Method = "POST" - - request.Sender(senderName) - request.To(receiverPhone, message) - - response, err := afro.MakeRequestWithContext(ctx, request) - if err != nil { - return err - } - - ack, ok := response["acknowledge"].(string) - if !ok { - return fmt.Errorf("unexpected SMS response format: %v", response) - } - - if ack != "success" { - return fmt.Errorf("SMS delivery failed: %v", response) - } - - return nil -} - func (s *Service) SendAfroMessageSMSTemp( ctx context.Context, receiverPhone string, @@ -743,7 +709,7 @@ func (s *Service) SendBulkPushNotification(ctx context.Context, userIDs []int64, // It sends sequentially and returns the count of successful and failed deliveries. func (s *Service) SendBulkSMS(ctx context.Context, recipients []string, message string) (sent int, failed int) { for _, phone := range recipients { - if err := s.SendAfroMessageSMS(ctx, phone, message); err != nil { + if err := s.SendAfroMessageSMSTemp(ctx, phone, message, nil); err != nil { s.mongoLogger.Error("[NotificationSvc.SendBulkSMS] Failed to send SMS", zap.String("phone", phone), zap.Error(err), diff --git a/internal/services/user/common.go b/internal/services/user/common.go index 2f2946a..f0c23a7 100644 --- a/internal/services/user/common.go +++ b/internal/services/user/common.go @@ -35,7 +35,7 @@ func (s *Service) ResendOtp( // Broadcast OTP (same logic as SendOtp) switch otp.Medium { case domain.OtpMediumSms: - if err := s.messengerSvc.SendAfroMessageSMS(ctx, otp.SentTo, message); err != nil { + if err := s.messengerSvc.SendAfroMessageSMSLatest(ctx, otp.SentTo, message, nil); err != nil { return err } case domain.OtpMediumEmail: @@ -68,17 +68,8 @@ func (s *Service) SendOtp(ctx context.Context, userID int64, sentTo string, otpF switch medium { case domain.OtpMediumSms: - switch provider { - case domain.TwilioSms: - if err := s.messengerSvc.SendTwilioSMS(ctx, sentTo, message); err != nil { - return err - } - case domain.AfroMessage: - if err := s.messengerSvc.SendAfroMessageSMS(ctx, sentTo, message); err != nil { - return err - } - default: - return fmt.Errorf("invalid sms provider: %s", provider) + if err := s.messengerSvc.SendAfroMessageSMSLatest(ctx, sentTo, message, nil); err != nil { + return err } case domain.OtpMediumEmail: if err := s.messengerSvc.SendEmail(ctx, sentTo, message, message, "Yimaru - One Time Password"); err != nil { diff --git a/internal/services/user/register.go b/internal/services/user/register.go index a1fbbe2..882ea7a 100644 --- a/internal/services/user/register.go +++ b/internal/services/user/register.go @@ -99,7 +99,7 @@ func (s *Service) RegisterUser(ctx context.Context, registerReq domain.RegisterU return domain.User{}, err } - if err := s.SendOtp(ctx, user.ID, sentTo, domain.OtpRegister, registerReq.OtpMedium, domain.TwilioSms); err != nil { + if err := s.SendOtp(ctx, user.ID, sentTo, domain.OtpRegister, registerReq.OtpMedium, domain.AfroMessage); err != nil { return domain.User{}, err }