urdt/ussd
5
0
Fork 0
Code Issues 50 Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/menu-traversals' into menu-traversals

Browse Source
This commit is contained in:
Carlosokumu 2024-10-02 13:54:00 +03:00
commit 7f6405d356
Signed by: carlos
GPG Key ID: 7BD6BC8160A5C953
24 changed files with 51 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/handlers/ussd/menuhandler.go
View File

@ -241,21 +241,24 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
accountPIN := string(input) accountPIN := string(input)
// Validate that the PIN is a 4-digit number if accountPIN != "0" { // for the 0:Back case
if !isValidPIN(accountPIN) { // Validate that the PIN is a 4-digit number
res.FlagSet = append(res.FlagSet, flag_incorrect_pin) 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 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 return res, nil
} }
func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
func (h *Handlers) GetVoucherList(ctx context.Context,sym string,input []byte) (resource.Result,error){
var res resource.Result var res resource.Result
vouchers := []string{ vouchers := []string{
"SRF", "SRF",
@ -286,9 +289,9 @@ func (h *Handlers) GetVoucherList(ctx context.Context,sym string,input []byte) (
for i, voucher := range vouchers { for i, voucher := range vouchers {
numberedVouchers = append(numberedVouchers, fmt.Sprintf("%d:%s", i+1, voucher)) numberedVouchers = append(numberedVouchers, fmt.Sprintf("%d:%s", i+1, voucher))
} }
res.Content = strings.Join(numberedVouchers,"\n") res.Content = strings.Join(numberedVouchers, "\n")
return res,nil return res, nil
} }
func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@ -577,7 +580,7 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
if err != nil { if err != nil {
return res, err return res, err
} }
if len(input) == 4 { if len(input) > 1 {
if bytes.Equal(input, AccountPin) { if bytes.Equal(input, AccountPin) {
if h.st.MatchFlag(flag_account_authorized, false) { if h.st.MatchFlag(flag_account_authorized, false) {
res.FlagReset = append(res.FlagReset, flag_incorrect_pin) res.FlagReset = append(res.FlagReset, flag_incorrect_pin)

2
services/registration/confirm_pin_change
View File

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

4
services/registration/confirm_pin_change.vis
View File

@ -2,6 +2,4 @@ CATCH invalid_pin flag_valid_pin 0
MOUT back 0 MOUT back 0
HALT HALT
INCMP _ 0 INCMP _ 0
INCMP * pin_reset_success INCMP pin_reset_success *

2
services/registration/confirm_pin_change_swa
View File

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

2
services/registration/enter_familyname_swa
View File

@ -1 +1 @@
Weka jina la familia Weka jina la familia

3
services/registration/enter_name.vis
View File

@ -7,6 +7,3 @@ HALT
RELOAD save_firstname RELOAD save_firstname
INCMP _ 0 INCMP _ 0
INCMP pin_entry * INCMP pin_entry *

3
services/registration/invalid_pin_swa
View File

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

3
services/registration/my_vouchers.vis
View File

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

2
services/registration/new_pin
View File

@ -1 +1 @@
Enter a new four number pin Enter a new four number PIN

11
services/registration/new_pin.vis
View File

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

3
services/registration/new_pin_swa
View File

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

2
services/registration/old_pin
View File

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

6
services/registration/old_pin.vis
View File

@ -1,7 +1,9 @@
LOAD reset_allow_update 0 LOAD reset_allow_update 0
RELOAD reset_allow_update
MOUT back 0 MOUT back 0
HALT HALT
RELOAD reset_allow_update LOAD authorize_account 12
RELOAD authorize_account
CATCH incorrect_pin flag_incorrect_pin 1
INCMP _ 0 INCMP _ 0
INCMP new_pin * INCMP new_pin *

2
services/registration/old_pin_swa
View File

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

3
services/registration/pin_management.vis
View File

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

2
services/registration/pin_reset_mismatch
View File

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

1
services/registration/pin_reset_mismatch.vis
View File

@ -3,4 +3,3 @@ MOUT quit 9
HALT HALT
INCMP confirm_pin_change 1 INCMP confirm_pin_change 1
INCMP quit 9 INCMP quit 9

2
services/registration/pin_reset_success
View File

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

4
services/registration/pin_reset_success.vis
View File

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

2
services/registration/pin_reset_success_swa
View File

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

2
services/registration/profile_update_success
View File

@ -1 +1 @@
Profile updated successfully Profile updated successfully

2
services/registration/profile_update_success_swa
View File

@ -1 +1 @@
Ombi la Kuweka wasifu limefanikiwa Ombi la Kuweka wasifu limefanikiwa

2
services/registration/select_gender.vis
View File

@ -9,5 +9,3 @@ HALT
RELOAD save_gender RELOAD save_gender
INCMP _ 0 INCMP _ 0
INCMP pin_entry * INCMP pin_entry *

20
test_data.json
View File

@ -188,19 +188,19 @@
}, },
{ {
"input": "1", "input": "1",
"expectedContent": "Enter your old PIN\n\n0:Back" "expectedContent": "Enter your old PIN\n0:Back"
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Enter a new four number pin\n\n0:Back" "expectedContent": "Enter a new four number pin\n0:Back"
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Confirm your new PIN:\n\n0:Back" "expectedContent": "Confirm your new PIN:\n0:Back"
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit" "expectedContent": "Your PIN change request has been successful\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -288,7 +288,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -322,7 +322,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -356,7 +356,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -390,7 +390,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -424,7 +424,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",
@ -458,7 +458,7 @@
}, },
{ {
"input": "1234", "input": "1234",
"expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit" "expectedContent": "Profile updated successfully\n0:Back\n9:Quit"
}, },
{ {
"input": "9", "input": "9",