use authorize flag instead of unlock

cmd/main.go

@@ -46,7 +46,7 @@ func main() {
 	state.FlagDebugger.Register(models.USERFLAG_PIN_SET, "PIN_SET")
 	state.FlagDebugger.Register(models.USERFLAG_INVALID_RECIPIENT_WITH_INVITE, "INVALIDRECIPIENT_WITH_INVITE")
 	state.FlagDebugger.Register(models.USERFLAG_INVALID_AMOUNT, "INVALIDAMOUNT")
-	state.FlagDebugger.Register(models.USERFLAG_UNLOCKFORUPDATE, "UNLOCKFORUPDATE")
+	state.FlagDebugger.Register(models.USERFLAG_ALLOW_UPDATE, "UNLOCKFORUPDATE")
 	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "VALIDPIN")
 	state.FlagDebugger.Register(models.USERFLAG_VALIDPIN, "ACCOUNTUNLOCKED")
 	state.FlagDebugger.Register(models.USERFLAG_ACCOUNT_CREATION_FAILED, "ACCOUNT_CREATION_FAILED")
@@ -91,7 +91,7 @@ func main() {
 	rfs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
 	rfs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
 	rfs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
-	rfs.AddLocalFunc("unlock_account", ussdHandlers.Unlock)
+	rfs.AddLocalFunc("unlock_account", ussdHandlers.Authorize)
 	rfs.AddLocalFunc("quit", ussdHandlers.Quit)
 	rfs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
 	rfs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
@@ -110,8 +110,8 @@ func main() {
 	rfs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
 	rfs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
 	rfs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
-	rfs.AddLocalFunc("reset_unlocked", ussdHandlers.ResetAccountUnlocked)
-	rfs.AddLocalFunc("reset_unlock_for_update", ussdHandlers.ResetUnlockForUpdate)
+	rfs.AddLocalFunc("reset_unlocked", ussdHandlers.ResetAccountAuthorized)
+	rfs.AddLocalFunc("reset_unlock_for_update", ussdHandlers.ResetAllowUpdate)
 	rfs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
 	rfs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
 	rfs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)

internal/handlers/ussd/menuhandler.go

@@ -20,7 +20,7 @@ import (
 )
 
 var (
-	scriptDir      = path.Join( "services", "registration")
+	scriptDir      = path.Join("services", "registration")
 	translationDir = path.Join(scriptDir, "locale")
 )
 
@@ -44,7 +44,7 @@ type Handlers struct {
 	fs                 *FSData
 	accountCreator     AccountCreator
 	accountFileHandler utils.AccountFileHandlerInterface
-	accountService server.AccountServiceInterface
+	accountService     server.AccountServiceInterface
 }
 
 func NewHandlers(path string, st *state.State) *Handlers {
@@ -55,10 +55,12 @@ func NewHandlers(path string, st *state.State) *Handlers {
 		},
 		accountFileHandler: utils.NewAccountFileHandler(path + "_data"),
 		accountCreator:     &ServerAccountCreator{},
-		accountService: &server.AccountService{},
+		accountService:     &server.AccountService{},
 	}
 }
 
+
+
 // Define the regex pattern as a constant
 const pinPattern = `^\d{4}$`
 
@@ -158,19 +160,19 @@ func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resou
 	return res, nil
 }
 
-//SetResetSingleEdit sets and resets  flags to allow gradual editing of profile information. 
+// SetResetSingleEdit sets and resets  flags to allow gradual editing of profile information.
 func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	menuOption := string(input)
 	switch menuOption {
 	case "2":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_UNLOCKFORUPDATE)
+		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
 		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
 	case "3":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_UNLOCKFORUPDATE)
+		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
 		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
 	case "4":
-		res.FlagReset = append(res.FlagSet, models.USERFLAG_UNLOCKFORUPDATE)
+		res.FlagReset = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
 		res.FlagSet = append(res.FlagSet, models.USERFLAG_SINGLE_EDIT)
 	default:
 		res.FlagReset = append(res.FlagReset, models.USERFLAG_SINGLE_EDIT)
@@ -180,7 +182,7 @@ func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []b
 }
 
 // VerifyPin checks whether the confirmation PIN is similar to the account PIN
-// If similar, it sets the USERFLAG_PIN_SET flag allowing the user 
+// If similar, it sets the USERFLAG_PIN_SET flag allowing the user
 // to access the main menu
 func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
@@ -317,7 +319,7 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
 		case "2":
 			gender = "Female"
 		case "3":
-			gender = "Other"
+			gender = "Unspecified"
 		}
 		accountData["Gender"] = gender
 
@@ -350,17 +352,17 @@ func (h *Handlers) SaveOfferings(ctx context.Context, sym string, input []byte)
 	return res, nil
 }
 
-//ResetUnlockForUpdate resets the unlockforupdate flag to correctly show appropriate nodes as a user provides the profile data.
-func (h *Handlers) ResetUnlockForUpdate(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+// ResetAllowUpdate resets the allowupdate flag that allows a user to update  profile data.
+func (h *Handlers) ResetAllowUpdate(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_UNLOCKFORUPDATE)
+	res.FlagReset = append(res.FlagReset, models.USERFLAG_ALLOW_UPDATE)
 	return res, nil
 }
 
-//ResetAccountUnlocked locks an account that had already been unlocked.
-func (h *Handlers) ResetAccountUnlocked(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+// 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) {
 	res := resource.Result{}
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 	return res, nil
 }
 
@@ -378,9 +380,9 @@ func (h *Handlers) CheckIdentifier(ctx context.Context, sym string, input []byte
 	return res, nil
 }
 
-// Unlock attempts to unlock the next sequential nodes by verifying the provided PIN against the already set PIN.
+// Authorize attempts to unlock the next sequential nodes by verifying the provided PIN against the already set PIN.
 // It sets the required flags that control the flow.
-func (h *Handlers) Unlock(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	pin := string(input)
 
@@ -392,22 +394,22 @@ func (h *Handlers) Unlock(ctx context.Context, sym string, input []byte) (resour
 	if len(input) == 4 {
 		if pin != accountData["AccountPIN"] {
 			res.FlagSet = append(res.FlagSet, models.USERFLAG_INCORRECTPIN)
-			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 			return res, nil
 		}
-		if h.fs.St.MatchFlag(models.USERFLAG_ACCOUNT_UNLOCKED, false) {
+		if h.fs.St.MatchFlag(models.USERFLAG_ACCOUNT_AUTHORIZED, false) {
 			res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTPIN)
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_UNLOCKFORUPDATE)
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_UNLOCKED)
+			res.FlagSet = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
+			res.FlagSet = append(res.FlagSet, models.USERFLAG_ACCOUNT_AUTHORIZED)
 		} else {
-			res.FlagSet = append(res.FlagSet, models.USERFLAG_UNLOCKFORUPDATE)
-			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+			res.FlagSet = append(res.FlagSet, models.USERFLAG_ALLOW_UPDATE)
+			res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 		}
 	}
 	return res, nil
 }
 
-//ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
+// ResetIncorrectPin resets the incorrect pin flag  after a new PIN attempt.
 func (h *Handlers) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTPIN)
@@ -458,7 +460,7 @@ func (h *Handlers) Quit(ctx context.Context, sym string, input []byte) (resource
 	l.AddDomain("default")
 	
 	res.Content = l.Get("Thank you for using Sarafu. Goodbye!")
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 	return res, nil
 }
 
@@ -482,14 +484,14 @@ func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }
 
-//ResetIncorrectYob resets the incorrect date format after a new attempt 
+// ResetIncorrectYob resets the incorrect date format after a new attempt
 func (h *Handlers) ResetIncorrectYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
 	res.FlagReset = append(res.FlagReset, models.USERFLAG_INCORRECTDATEFORMAT)
 	return res, nil
 }
 
-// CheckBalance retrieves the balance from the API using the "PublicKey" and sets 
+// CheckBalance retrieves the balance from the API using the "PublicKey" and sets
 // the balance as the result content
 func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
@@ -582,7 +584,7 @@ func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input
 	return res, nil
 }
 
-// MaxAmount gets the current balance from the API and sets it as 
+// MaxAmount gets the current balance from the API and sets it as
 // the result content.
 func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
@@ -737,7 +739,6 @@ func (h *Handlers) GetAmount(ctx context.Context, sym string, input []byte) (res
 	return res, nil
 }
 
-
 // QuickWithBalance retrieves the balance for a given public key from the custodial balance API endpoint before
 // gracefully exiting the session.
 func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@@ -754,7 +755,7 @@ func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte
 		return res, nil
 	}
 	res.Content = l.Get("Your account balance is %s", balance)
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 	return res, nil
 }
 
@@ -785,6 +786,6 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
 		return res, err
 	}
 
-	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
+	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_AUTHORIZED)
 	return res, nil
 }

internal/models/flags.go

@@ -7,11 +7,11 @@ const (
 	USERFLAG_ACCOUNT_CREATED
 	USERFLAG_ACCOUNT_PENDING
 	USERFLAG_ACCOUNT_SUCCESS
-	USERFLAG_ACCOUNT_UNLOCKED
+	USERFLAG_ACCOUNT_AUTHORIZED
 	USERFLAG_INVALID_RECIPIENT
 	USERFLAG_INVALID_RECIPIENT_WITH_INVITE
 	USERFLAG_INCORRECTPIN
-	USERFLAG_UNLOCKFORUPDATE
+	USERFLAG_ALLOW_UPDATE
 	USERFLAG_INVALID_AMOUNT
 	USERFLAG_PIN_SET
 	USERFLAG_VALIDPIN

services/registration/other_gender_menu

@@ -1 +0,0 @@
-Other

services/registration/other_gender_menu_swa

@@ -1 +0,0 @@
-Nyingineo

services/registration/select_gender.vis

@@ -2,7 +2,7 @@ LOAD save_familyname 0
 CATCH update_success 16 1
 MOUT male 1
 MOUT female 2
-MOUT other_gender 3
+MOUT unspecified 3
 MOUT back 0
 HALT
 LOAD save_gender 0

services/registration/unspecified_menu

@@ -0,0 +1 @@
+Unspecified

services/registration/unspecified_menu_swa

@@ -0,0 +1 @@
+Haijabainishwa