go.mod

@@ -3,9 +3,9 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2
+	git.defalsify.org/vise.git v0.3.2-0.20250401123711-d481b04a6805
 	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417201442-5c0ed48e678c
 	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2

go.sum

@@ -4,8 +4,26 @@ git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce h1:Uke2jQ4wG97gQ
 git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
 git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
+git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8 h1:Emesd0rybSLhPwZwqdvLsk/P9ZsT+7CQwQV/mrjQp3o=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5 h1:DwBZHP4sebfHxK8EU2nlA2CXU81+a7Kj/pnC5vDPcf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401111804-2eed990921c5/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440 h1:eWrBZMM3pBMCFyRl4rO/aaR+OmOMFJxogNyFAFry+EM=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401115503-5b41c8dc6440/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad h1:tYjanaCf6mF+iXRtDx5gckQm5vhZYx9N/JlNIBZj1m0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250401122510-441e289854ad/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8 h1:Emesd0rybSLhPwZwqdvLsk/P9ZsT+7CQwQV/mrjQp3o=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250411080608-34957e5b6ff8/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417155812-58366274c3e1 h1:Yt9S+9JtCB4Y6jw6Xo1WGoVVu591n3/tSRIwM3kw1uY=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417155812-58366274c3e1/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417191830-86cfb9c02028 h1:HuIL9BClNieD7QCikCW1sJ9HyIo9iqRDFqULJGHxbrM=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417191830-86cfb9c02028/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417200733-5ff139b6494b h1:0Ldq9SKqu+oNljNaKpQFyUgl3cOi6LJulGZwf5vXuWo=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417200733-5ff139b6494b/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417201442-5c0ed48e678c h1:fO8NGQ/sLdwpbi3UWzZZxqOXGrEzMVXyxER5ziGuZLI=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250417201442-5c0ed48e678c/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=

handlers/application/menuhandler.go

@@ -29,6 +29,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/sms"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/profile"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
@@ -77,6 +78,7 @@ type MenuHandlers struct {
 	flagManager          *FlagManager
 	accountService       remote.AccountService
 	prefixDb             storedb.PrefixDb
+	smsService           sms.SmsService
 	logDb                store.LogDb
 	profile              *profile.Profile
 	ReplaceSeparatorFunc func(string) string
@@ -90,6 +92,10 @@ func NewMenuHandlers(appFlags *FlagManager, userdataStore db.Db, logdb db.Db, ac
 	userDb := &store.UserDataStore{
 		Db: userdataStore,
 	}
+	smsservice := sms.SmsService{
+		Accountservice: accountService,
+		Userdatastore:  *userDb,
+	}
 
 	logDb := store.LogDb{
 		Db: logdb,
@@ -103,6 +109,7 @@ func NewMenuHandlers(appFlags *FlagManager, userdataStore db.Db, logdb db.Db, ac
 		userdataStore:        userDb,
 		flagManager:          appFlags,
 		accountService:       accountService,
+		smsService:           smsservice,
 		prefixDb:             prefixDb,
 		logDb:                logDb,
 		profile:              &profile.Profile{Max: 6},
@@ -519,7 +526,10 @@ func (h *MenuHandlers) ValidateBlockedNumber(ctx context.Context, sym string, in
 // 3. Resetting the DATA_INCORRECT_PIN_ATTEMPTS to 0 for the blocked phone number
 func (h *MenuHandlers) ResetOthersPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
 	store := h.userdataStore
+	smsservice := h.smsService
+
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
@@ -541,7 +551,15 @@ func (h *MenuHandlers) ResetOthersPin(ctx context.Context, sym string, input []b
 		logg.ErrorCtxf(ctx, "failed to reset incorrect PIN attempts", "key", storedb.DATA_INCORRECT_PIN_ATTEMPTS, "error", err)
 		return res, err
 	}
-
+	blockedPhoneStr := string(blockedPhonenumber)
+	//Trigger an SMS to inform a user that the  blocked account has been reset
+	if phone.IsValidPhoneNumber(blockedPhoneStr) {
+		err = smsservice.SendPINResetSMS(ctx, sessionId, blockedPhoneStr)
+		if err != nil {
+			logg.DebugCtxf(ctx, "Failed to send PIN reset SMS", "error", err)
+			return res, nil
+		}
+	}
 	return res, nil
 }
 
@@ -1271,17 +1289,30 @@ func (h *MenuHandlers) ResetAccountAuthorized(ctx context.Context, sym string, i
 	return res, nil
 }
 
-// CheckIdentifier retrieves the PublicKey from the JSON data file.
+// CheckIdentifier retrieves the Public key from the userdatastore under the key: DATA_PUBLIC_KEY and triggers an sms that
+// will be sent to the associated session id
 func (h *MenuHandlers) CheckIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
+
+	smsservice := h.smsService
+
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 	store := h.userdataStore
-	publicKey, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	publicKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
-
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
+		return res, err
+	}
 	res.Content = string(publicKey)
+	//trigger an address sms to be delivered to the associated session id
+	err = smsservice.SendAddressSMS(ctx)
+	if err != nil {
+		logg.DebugCtxf(ctx, "Failed to trigger an address sms", "error", err)
+		return res, nil
+	}
 
 	return res, nil
 }
@@ -1678,6 +1709,7 @@ func (h *MenuHandlers) TransactionReset(ctx context.Context, sym string, input [
 func (h *MenuHandlers) InviteValidRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	store := h.userdataStore
+	smsservice := h.smsService
 
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@@ -1699,7 +1731,7 @@ func (h *MenuHandlers) InviteValidRecipient(ctx context.Context, sym string, inp
 		return res, nil
 	}
 
-	_, err = h.accountService.SendUpsellSMS(ctx, sessionId, string(recipient))
+	_, err = smsservice.Accountservice.SendUpsellSMS(ctx, sessionId, string(recipient))
 	if err != nil {
 		res.Content = l.Get("Your invite request for %s to Sarafu Network failed. Please try again later.", string(recipient))
 		return res, nil

internal/sms/sms.go

@@ -0,0 +1,96 @@
+package sms
+
+import (
+	"context"
+	"fmt"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/common/phone"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("smsservice")
+)
+
+type SmsService struct {
+	Accountservice remote.AccountService
+	Userdatastore  store.UserDataStore
+}
+
+// SendUpsellSMS will send an invitation SMS to an unregistered phone number
+func (smsservice *SmsService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) error {
+	if !phone.IsValidPhoneNumber(inviterPhone) {
+		return fmt.Errorf("invalid inviter phone number %v", inviterPhone)
+	}
+
+	if !phone.IsValidPhoneNumber(inviteePhone) {
+		return fmt.Errorf("Invalid invitee phone number %v", inviteePhone)
+	}
+	_, err := smsservice.Accountservice.SendUpsellSMS(ctx, inviterPhone, inviteePhone)
+	if err != nil {
+		return fmt.Errorf("Failed to send upsell sms: %v", err)
+	}
+	return nil
+}
+
+// sendPINResetSMS will send an SMS to a user's phonenumber in the event that the associated account's PIN has been reset.
+func (smsService *SmsService) SendPINResetSMS(ctx context.Context, adminPhoneNumber, blockedPhoneNumber string) error {
+	formattedAdminPhone, err := phone.FormatPhoneNumber(adminPhoneNumber)
+	if err != nil {
+		return fmt.Errorf("failed to format admin phone number: %w", err)
+	}
+
+	formattedBlockedPhone, err := phone.FormatPhoneNumber(blockedPhoneNumber)
+	if err != nil {
+		return fmt.Errorf("failed to format blocked phone number: %w", err)
+	}
+
+	if !phone.IsValidPhoneNumber(formattedAdminPhone) {
+		return fmt.Errorf("invalid admin phone number")
+	}
+	if !phone.IsValidPhoneNumber(formattedBlockedPhone) {
+		return fmt.Errorf("invalid blocked phone number")
+	}
+
+	err = smsService.Accountservice.SendPINResetSMS(ctx, formattedAdminPhone, formattedBlockedPhone)
+	if err != nil {
+		return fmt.Errorf("failed to send pin reset sms: %v", err)
+	}
+
+	return nil
+}
+
+// SendAddressSMS will triger an SMS when a user navigates to the my address node.The SMS will be sent to the associated phonenumber.
+func (smsService *SmsService) SendAddressSMS(ctx context.Context) error {
+	store := smsService.Userdatastore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return fmt.Errorf("missing session")
+	}
+
+	publicKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
+		return err
+	}
+
+	originPhone, err := phone.FormatPhoneNumber(sessionId)
+	if err != nil {
+		logg.DebugCtxf(ctx, "Failed to format origin phonenumber", "sessionid", sessionId)
+		return nil
+	}
+
+	if !phone.IsValidPhoneNumber(originPhone) {
+		logg.InfoCtxf(ctx, "Invalid origin phone number", "origin phonenumber", originPhone)
+		return fmt.Errorf("invalid origin phone number")
+	}
+	err = smsService.Accountservice.SendAddressSMS(ctx, string(publicKey), originPhone)
+	if err != nil {
+		logg.DebugCtxf(ctx, "Failed to send address sms", "error", err)
+		return fmt.Errorf("Failed to send address sms: %v", err)
+	}
+	return nil
+}

services/registration/address.vis

@@ -1,5 +1,4 @@
 LOAD check_identifier 0
-RELOAD check_identifier
 MAP check_identifier
 MOUT back 0
 MOUT quit 9