use single temporary value

.env.example

@@ -16,3 +16,7 @@ CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create
 TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/
 BALANCE_URL=https://custodial.sarafu.africa/api/account/status/
 TRACK_URL=http://localhost:5003/api/v2/account/status
+
+
+#numbers with privileges to reset others pin
+ADMIN_NUMBERS=254051722XXX,255012221XXX

cmd/africastalking/main.go

@@ -131,7 +131,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {

cmd/async/main.go

@@ -104,8 +104,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
+
 	accountService := server.AccountService{}
 
 	hl, err := lhs.GetHandler(&accountService)

cmd/http/main.go

@@ -92,13 +92,14 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
+
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/main.go

@@ -88,7 +88,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
 	lhs.SetPersister(pe)
 

devtools/admin/admin_numbers.json

@@ -0,0 +1,7 @@
+{
+  "admins": [
+    {
+      "phonenumber" : "<replace with any admin number to test with >"
+    }
+   ]
+}

devtools/admin/commands/seed.go

@@ -0,0 +1,47 @@
+package commands
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/urdt/ussd/internal/utils"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type Admin struct {
+	PhoneNumber string `json:"phonenumber"`
+}
+
+type Config struct {
+	Admins []Admin `json:"admins"`
+}
+
+func Seed(ctx context.Context) error {
+	var config Config
+	adminstore, err := utils.NewAdminStore(ctx, "../admin_numbers")
+	store := adminstore.FsStore
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+	data, err := os.ReadFile("admin_numbers.json")
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(data, &config); err != nil {
+		return err
+	}
+	for _, admin := range config.Admins {
+		err := store.Put(ctx, []byte(admin.PhoneNumber), []byte("1"))
+		if err != nil {
+			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
+			return err
+		}
+	}
+	return nil
+}

devtools/admin/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"context"
+	"log"
+
+	"git.grassecon.net/urdt/ussd/devtools/admin/commands"
+)
+
+func main() {
+	ctx := context.Background()
+	err := commands.Seed(ctx)
+	if err != nil {
+		log.Fatalf("Failed to initialize a list of admins with error %s", err)
+	}
+
+}

internal/handlers/handlerservice.go

@@ -1,6 +1,8 @@
 package handlers
 
 import (
+	"context"
+
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
@@ -8,6 +10,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
+	"git.grassecon.net/urdt/ussd/internal/utils"
 )
 
 type HandlerService interface {
@@ -28,20 +31,26 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
+	AdminStore    *utils.AdminStore
 	Cfg           engine.Config
 	Rs            resource.Resource
 }
 
-func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
+func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
 	parser, err := getParser(fp, debug)
 	if err != nil {
 		return nil, err
 	}
+	adminstore, err := utils.NewAdminStore(ctx, "admin_numbers")
+	if err != nil {
+		return nil, err
+	}
 	return &LocalHandlerService{
-		Parser: parser,
+		Parser:     parser,
-		DbRs:   dbResource,
+		DbRs:       dbResource,
-		Cfg:    cfg,
+		AdminStore: adminstore,
-		Rs:     rs,
+		Cfg:        cfg,
+		Rs:         rs,
 	}, nil
 }
 
@@ -54,7 +63,7 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 }
 
 func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
 	if err != nil {
 		return nil, err
 	}
@@ -98,6 +107,13 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
+	ls.DbRs.AddLocalFunc("reset_valid_pin", ussdHandlers.ResetValidPin)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", ussdHandlers.CheckPinMisMatch)
+	ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
+	ls.DbRs.AddLocalFunc("retrieve_blocked_number", ussdHandlers.RetrieveBlockedNumber)
+	ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
+	ls.DbRs.AddLocalFunc("reset_others_pin", ussdHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", ussdHandlers.SaveOthersTemporaryPin)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -35,6 +35,12 @@ var (
 	errResponse    *api.ErrResponse
 )
 
+// Define the regex patterns as  constants
+const (
+	phoneRegex = `(\(\d{3}\)\s?|\d{3}[-.\s]?)?\d{3}[-.\s]?\d{4}`
+	pinPattern = `^\d{4}$`
+)
+
 // FlagManager handles centralized flag management
 type FlagManager struct {
 	parser *asm.FlagParser
@@ -63,12 +69,13 @@ type Handlers struct {
 	st             *state.State
 	ca             cache.Memory
 	userdataStore  utils.DataStore
+	adminstore     *utils.AdminStore
 	flagManager    *asm.FlagParser
 	accountService server.AccountServiceInterface
 	prefixDb       storage.PrefixDb
 }
 
-func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService server.AccountServiceInterface) (*Handlers, error) {
+func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *utils.AdminStore, accountService server.AccountServiceInterface) (*Handlers, error) {
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
@@ -81,21 +88,24 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, accountService s
 	h := &Handlers{
 		userdataStore:  userDb,
 		flagManager:    appFlags,
+		adminstore:     adminstore,
 		accountService: accountService,
 		prefixDb:       prefixDb,
 	}
 	return h, nil
 }
 
-// Define the regex pattern as a constant
-const pinPattern = `^\d{4}$`
-
 // isValidPIN checks whether the given input is a 4 digit number
 func isValidPIN(pin string) bool {
 	match, _ := regexp.MatchString(pinPattern, pin)
 	return match
 }
 
+func isValidPhoneNumber(phonenumber string) bool {
+	match, _ := regexp.MatchString(phoneRegex, phonenumber)
+	return match
+}
+
 func (h *Handlers) WithPersister(pe *persist.Persister) *Handlers {
 	if h.pe != nil {
 		panic("persister already set")
@@ -106,13 +116,25 @@ func (h *Handlers) WithPersister(pe *persist.Persister) *Handlers {
 
 func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var r resource.Result
-
 	if h.pe == nil {
 		logg.WarnCtxf(ctx, "handler init called before it is ready or more than once", "state", h.st, "cache", h.ca)
 		return r, nil
 	}
+
 	h.st = h.pe.GetState()
 	h.ca = h.pe.GetMemory()
+
+	sessionId, _ := ctx.Value("SessionId").(string)
+	flag_admin_privilege, _ := h.flagManager.GetFlag("flag_admin_privilege")
+
+	isAdmin, _ := h.adminstore.IsAdmin(sessionId)
+
+	if isAdmin {
+		r.FlagSet = append(r.FlagSet, flag_admin_privilege)
+	} else {
+		r.FlagReset = append(r.FlagReset, flag_admin_privilege)
+	}
+
 	if h.st == nil || h.ca == nil {
 		logg.ErrorCtxf(ctx, "perister fail in handler", "state", h.st, "cache", h.ca)
 		return r, fmt.Errorf("cannot get state and memory for handler")
@@ -203,6 +225,30 @@ func (h *Handlers) CreateAccount(ctx context.Context, sym string, input []byte)
 	return res, nil
 }
 
+func (h *Handlers) CheckPinMisMatch(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	res := resource.Result{}
+	flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	store := h.userdataStore
+	blockedNumber, err := store.ReadEntry(ctx, sessionId, utils.DATA_BLOCKED_NUMBER)
+	if err != nil {
+		return res, err
+	}
+	temporaryPin, err := store.ReadEntry(ctx, string(blockedNumber), utils.DATA_TEMPORARY_VALUE)
+	if err != nil {
+		return res, err
+	}
+	if bytes.Equal(temporaryPin, input) {
+		res.FlagReset = append(res.FlagReset, flag_pin_mismatch)
+	} else {
+		res.FlagSet = append(res.FlagSet, flag_pin_mismatch)
+	}
+	return res, nil
+}
+
 func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	_, ok := ctx.Value("SessionId").(string)
@@ -234,7 +280,6 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	}
 
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
-
 	accountPIN := string(input)
 
 	// Validate that the PIN is a 4-digit number
@@ -242,9 +287,7 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
 		return res, nil
 	}
-
 	res.FlagReset = append(res.FlagReset, flag_incorrect_pin)
-
 	store := h.userdataStore
 	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_VALUE, []byte(accountPIN))
 	if err != nil {
@@ -254,6 +297,29 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
+func (h *Handlers) SaveOthersTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+
+	store := h.userdataStore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	temporaryPin := string(input)
+	blockedNumber, err := store.ReadEntry(ctx, sessionId, utils.DATA_BLOCKED_NUMBER)
+
+	if err != nil {
+		return res, err
+	}
+	err = store.WriteEntry(ctx, string(blockedNumber), utils.DATA_TEMPORARY_VALUE, []byte(temporaryPin))
+	if err != nil {
+		return res, err
+	}
+
+	return res, nil
+}
+
 func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	sessionId, ok := ctx.Value("SessionId").(string)
@@ -298,7 +364,6 @@ func (h *Handlers) VerifyCreatePin(ctx context.Context, sym string, input []byte
 	if err != nil {
 		return res, err
 	}
-
 	if bytes.Equal(input, temporaryPin) {
 		res.FlagSet = []uint32{flag_valid_pin}
 		res.FlagReset = []uint32{flag_pin_mismatch}
@@ -511,6 +576,14 @@ func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byt
 	return res, nil
 }
 
+// ResetAllowUpdate resets the allowupdate flag that allows a user to update  profile data.
+func (h *Handlers) ResetValidPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
+	res.FlagReset = append(res.FlagReset, flag_valid_pin)
+	return res, nil
+}
+
 // ResetAccountAuthorized resets the account authorization flag after a successful PIN entry.
 func (h *Handlers) ResetAccountAuthorized(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -594,11 +667,13 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
+
 	store := h.userdataStore
 	publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
 	if err != nil {
 		return res, err
 	}
+
 	okResponse, err = h.accountService.TrackAccountStatus(ctx, string(publicKey))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_error)
@@ -655,7 +730,6 @@ func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (res
 	var err error
 
 	flag_incorrect_date_format, _ := h.flagManager.GetFlag("flag_incorrect_date_format")
-
 	date := string(input)
 	_, err = strconv.Atoi(date)
 	if err != nil {
@@ -678,7 +752,6 @@ func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []by
 	var res resource.Result
 
 	flag_incorrect_date_format, _ := h.flagManager.GetFlag("flag_incorrect_date_format")
-
 	res.FlagReset = append(res.FlagReset, flag_incorrect_date_format)
 	return res, nil
 }
@@ -761,6 +834,67 @@ func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input
 	return res, nil
 }
 
+func (h *Handlers) ResetOthersPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	store := h.userdataStore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	blockedPhonenumber, err := store.ReadEntry(ctx, sessionId, utils.DATA_BLOCKED_NUMBER)
+	if err != nil {
+		return res, err
+	}
+	temporaryPin, err := store.ReadEntry(ctx, string(blockedPhonenumber), utils.DATA_TEMPORARY_VALUE)
+	if err != nil {
+		return res, err
+	}
+	err = store.WriteEntry(ctx, string(blockedPhonenumber), utils.DATA_ACCOUNT_PIN, []byte(temporaryPin))
+	if err != nil {
+		return res, nil
+	}
+	return res, nil
+}
+
+func (h *Handlers) ResetUnregisteredNumber(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	flag_unregistered_number, _ := h.flagManager.GetFlag("flag_unregistered_number")
+	res.FlagReset = append(res.FlagReset, flag_unregistered_number)
+	return res, nil
+}
+
+func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+	var err error
+
+	flag_unregistered_number, _ := h.flagManager.GetFlag("flag_unregistered_number")
+	store := h.userdataStore
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	blockedNumber := string(input)
+	_, err = store.ReadEntry(ctx, blockedNumber, utils.DATA_PUBLIC_KEY)
+	if !isValidPhoneNumber(blockedNumber) {
+		res.FlagSet = append(res.FlagSet, flag_unregistered_number)
+		return res, nil
+	}
+	if err != nil {
+		if db.IsNotFound(err) {
+			logg.Printf(logging.LVL_INFO, "Invalid or unregistered number")
+			res.FlagSet = append(res.FlagSet, flag_unregistered_number)
+			return res, nil
+		} else {
+			return res, err
+		}
+	}
+	err = store.WriteEntry(ctx, sessionId, utils.DATA_BLOCKED_NUMBER, []byte(blockedNumber))
+	if err != nil {
+		return res, nil
+	}
+	return res, nil
+}
+
 // ValidateRecipient validates that the given input is a valid phone number.
 func (h *Handlers) ValidateRecipient(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
@@ -932,6 +1066,22 @@ func (h *Handlers) GetRecipient(ctx context.Context, sym string, input []byte) (
 	return res, nil
 }
 
+// RetrieveBlockedNumber gets the current number during the pin reset for other's is in progress.
+func (h *Handlers) RetrieveBlockedNumber(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+
+	sessionId, ok := ctx.Value("SessionId").(string)
+	if !ok {
+		return res, fmt.Errorf("missing session")
+	}
+	store := h.userdataStore
+	blockedNumber, _ := store.ReadEntry(ctx, sessionId, utils.DATA_BLOCKED_NUMBER)
+
+	res.Content = string(blockedNumber)
+
+	return res, nil
+}
+
 // GetSender returns the sessionId (phoneNumber)
 func (h *Handlers) GetSender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

internal/handlers/ussd/menuhandler_test.go

@@ -42,7 +42,7 @@ func TestNewHandlers(t *testing.T) {
 	}
 	t.Run("Valid UserDataStore", func(t *testing.T) {
 		mockStore := &mocks.MockUserDataStore{}
-		handlers, err := NewHandlers(fm.parser, mockStore, &accountService)
+		handlers, err := NewHandlers(fm.parser, mockStore, nil, &accountService)
 		if err != nil {
 			t.Fatalf("expected no error, got %v", err)
 		}
@@ -58,7 +58,7 @@ func TestNewHandlers(t *testing.T) {
 	t.Run("Nil UserDataStore", func(t *testing.T) {
 		appFlags := &asm.FlagParser{}
 
-		handlers, err := NewHandlers(appFlags, nil, &accountService)
+		handlers, err := NewHandlers(appFlags, nil, nil, &accountService)
 
 		if err == nil {
 			t.Fatal("expected an error, got none")

internal/testutil/TestEngine.go

@@ -73,7 +73,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userDataStore)
 	lhs.SetPersister(pe)
 

internal/utils/adminstore.go

@@ -0,0 +1,51 @@
+package utils
+
+import (
+	"context"
+
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type AdminStore struct {
+	ctx     context.Context
+	FsStore db.Db
+}
+
+func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
+	fsStore, err := getFsStore(ctx, fileName)
+	if err != nil {
+		return nil, err
+	}
+	return &AdminStore{ctx: ctx, FsStore: fsStore}, nil
+}
+
+func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
+	fsStore := fsdb.NewFsDb()
+	err := fsStore.Connect(ctx, connectStr)
+	fsStore.SetPrefix(db.DATATYPE_USERDATA)
+	if err != nil {
+		return nil, err
+	}
+	return fsStore, nil
+}
+
+// Checks if the given sessionId is listed as an admin.
+func (as *AdminStore) IsAdmin(sessionId string) (bool, error) {
+	_, err := as.FsStore.Get(as.ctx, []byte(sessionId))
+	if err != nil {
+		if db.IsNotFound(err) {
+			logg.Printf(logging.LVL_INFO, "Returning false because session id was not found")
+			return false, nil
+		} else {
+			return false, err
+		}
+	}
+
+	return true, nil
+}

internal/utils/db.go

@@ -26,6 +26,7 @@ const (
 	DATA_VOUCHER_LIST
 	DATA_ACTIVE_SYM
 	DATA_ACTIVE_BAL
+	DATA_BLOCKED_NUMBER
 	DATA_PUBLIC_KEY_REVERSE
 	DATA_ACTIVE_DECIMAL
 	DATA_ACTIVE_ADDRESS

menutraversal_test/group_test.json

@@ -13,7 +13,7 @@
                 },
                 {
                     "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n3:Guard my PIN\n0:Back"
+                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
                 },
                 {
                     "input": "1",

services/registration/confirm_others_new_pin

@@ -0,0 +1 @@
+Please confirm new PIN  for:{{.retrieve_blocked_number}}

services/registration/confirm_others_new_pin.vis

@@ -0,0 +1,14 @@
+CATCH pin_entry flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 0
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *

services/registration/confirm_pin_change.vis

@@ -3,5 +3,3 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP * pin_reset_success
-
-

services/registration/enter_other_number

@@ -0,0 +1 @@
+Enter other's phone number:

services/registration/enter_other_number.vis

@@ -0,0 +1,7 @@
+CATCH no_admin_privilege flag_admin_privilege  0
+LOAD reset_account_authorized 0
+RELOAD reset_account_authorized
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP enter_others_new_pin *

services/registration/enter_others_new_pin

@@ -0,0 +1 @@
+Please enter new PIN for: {{.retrieve_blocked_number}}

services/registration/enter_others_new_pin.vis

@@ -0,0 +1,12 @@
+LOAD validate_blocked_number 6
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+HALT 
+LOAD verify_new_pin 6
+RELOAD verify_new_pin
+INCMP _ 0
+INCMP * confirm_others_new_pin

services/registration/guard_pin_menu

@@ -1 +0,0 @@
-Guard my PIN

services/registration/guard_pin_menu_swa

@@ -1 +0,0 @@
-Linda PIN yangu

services/registration/invalid_others_pin

@@ -0,0 +1 @@
+The PIN you have entered is invalid.Please try a 4 digit number instead.

services/registration/invalid_others_pin.vis

@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP enter_others_new_pin 1
+INCMP quit 9

services/registration/no_admin_privilege

@@ -0,0 +1 @@
+You do not have privileges to perform this action

services/registration/no_admin_privilege.vis

@@ -0,0 +1,5 @@
+MOUT quit 9
+MOUT back 0
+HALT
+INCMP pin_management 0
+INCMP quit 9

services/registration/others_pin_mismatch

@@ -0,0 +1 @@
+The PIN you have entered is not a match

services/registration/others_pin_mismatch.vis

@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9

services/registration/pin_management.vis

@@ -1,8 +1,8 @@
 MOUT change_pin 1
 MOUT reset_pin 2
-MOUT guard_pin 3
 MOUT back 0
 HALT
-INCMP _ 0
+INCMP my_account 0
 INCMP old_pin  1
-
+INCMP enter_other_number 2
+INCMP . *

services/registration/pin_reset_result

@@ -0,0 +1 @@
+PIN reset request for {{.retrieve_blocked_number}} was successful

services/registration/pin_reset_result.vis

@@ -0,0 +1,8 @@
+LOAD retrieve_blocked_number 0
+MAP retrieve_blocked_number
+LOAD reset_others_pin 6
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP pin_management 0
+INCMP quit  9

services/registration/pin_reset_success.vis

@@ -6,5 +6,3 @@ MOUT quit 9
 HALT
 INCMP main 0
 INCMP quit 9
-
-

services/registration/pp.csv

@@ -17,3 +17,5 @@ flag,flag_incorrect_date_format,23,this is set when the given year of birth is i
 flag,flag_incorrect_voucher,24,this is set when the selected voucher is invalid
 flag,flag_api_call_error,25,this is set when communication to an external service fails
 flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
+flag,flag_admin_privilege,27,this is set when a user has admin privileges.
+flag,flag_unregistered_number,28,this is set when an unregistered phonenumber tries to perform an action

services/registration/unregistered_number

@@ -0,0 +1 @@
+The number you have entered is either not registered with Sarafu or is invalid.

services/registration/unregistered_number.vis

@@ -0,0 +1,7 @@
+LOAD reset_unregistered_number 0
+RELOAD reset_unregistered_number
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9