cmd/main.go

@@ -71,9 +71,6 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.P
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
-	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -216,74 +216,6 @@ func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resou
 	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)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
-	pinInput := string(input)
-	// Validate that the PIN is a 4-digit number
-	if isValidPIN(pinInput) {
-		res.FlagSet = append(res.FlagSet, flag_valid_pin)
-	} else {
-		res.FlagReset = append(res.FlagReset, flag_valid_pin)
-	}
-
-	return res, nil
-}
-
-func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
-	var res resource.Result
-	var err error
-
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
-
-	accountPIN := string(input)
-
-	// Validate that the PIN is a 4-digit number
-	if !isValidPIN(accountPIN) {
-		res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
-		return res, nil
-	}
-	store := h.userdataStore
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(accountPIN))
-	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)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
-	flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
-
-	store := h.userdataStore
-	temporaryPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN)
-	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)
-	}
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(temporaryPin))
-	if err != nil {
-		return res, err
-	}
-	return res, nil
-}
-
 // 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) {
 	var res resource.Result
@@ -390,6 +322,9 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
 		if err != nil {
 			return res, err
 		}
+		if err != nil {
+			return res, nil
+		}
 	} else {
 		return res, fmt.Errorf("a family name cannot be less than one character")
 	}
@@ -546,6 +481,8 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 	if err != nil {
 		return res, err
 	}
+
+	if err == nil {
 		if len(input) == 4 {
 			if bytes.Equal(input, AccountPin) {
 				if h.st.MatchFlag(flag_account_authorized, false) {
@@ -560,9 +497,11 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
 				res.FlagReset = append(res.FlagReset, flag_account_authorized)
 				return res, nil
 			}
+		}
 	} else {
 		return res, nil
 	}
+
 	return res, nil
 }
 

internal/utils/db.go

@@ -22,7 +22,6 @@ const (
 	DATA_OFFERINGS
 	DATA_RECIPIENT
 	DATA_AMOUNT
-	DATA_TEMPORARY_PIN
 )
 
 func typToBytes(typ DataTyp) []byte {

services/registration/confirm_pin_change

@@ -1 +0,0 @@
-Confirm your new PIN:

services/registration/confirm_pin_change.vis

@@ -1,7 +0,0 @@
-CATCH invalid_pin flag_valid_pin 0
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP * pin_reset_success
-
-

services/registration/confirm_pin_change_swa

@@ -1 +0,0 @@
-Thibitisha PIN yako mpya:

services/registration/invalid_pin

@@ -1 +0,0 @@
-The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885

services/registration/invalid_pin.vis

@@ -1,3 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0

services/registration/invalid_pin_swa

@@ -1 +0,0 @@
-PIN mpya na udhibitisho wa pin mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.

services/registration/new_pin

@@ -1 +0,0 @@
-Enter a new four number pin

services/registration/new_pin.vis

@@ -1,13 +0,0 @@
-LOAD authorize_account 12
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH old_pin flag_allow_update 0
-MOUT back 0
-HALT
-INCMP _ 0
-LOAD save_temporary_pin 6
-LOAD verify_new_pin 0
-RELOAD save_temporary_pin
-RELOAD verify_new_pin
-INCMP * confirm_pin_change
-

services/registration/new_pin_swa

@@ -1,2 +0,0 @@
-Weka PIN mpya ya nne nambari: 
-

services/registration/old_pin

@@ -1 +0,0 @@
-Enter your old PIN

services/registration/old_pin.vis

@@ -1,7 +0,0 @@
-LOAD reset_allow_update 0
-MOUT back 0
-HALT
-RELOAD reset_allow_update
-INCMP _ 0
-INCMP new_pin *
-

services/registration/old_pin_swa

@@ -1 +0,0 @@
-Weka PIN yako ya zamani:

services/registration/pin_management.vis

@@ -4,5 +4,3 @@ MOUT guard_pin 3
 MOUT back 0
 HALT
 INCMP _ 0
-INCMP old_pin  1
-

services/registration/pin_reset_mismatch

@@ -1 +0,0 @@
-The PIN is not a match. Try again

services/registration/pin_reset_mismatch.vis

@@ -1,6 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_pin_change 1
-INCMP quit 9
-

services/registration/pin_reset_success

@@ -1 +0,0 @@
-Your PIN change request has been successful

services/registration/pin_reset_success.vis

@@ -1,10 +0,0 @@
-LOAD confirm_pin_change 0
-RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP main 0
-INCMP quit 9
-
-

services/registration/pin_reset_success_swa

@@ -1 +0,0 @@
-Ombi lako la kubadili PIN limefanikiwa