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

wip-menu-select-fix #78

Closed
carlos wants to merge 23 commits from wip-menu-select-fix into master
pull from: wip-menu-select-fix
merge into: urdt:master
Conversation 0 Commits 23 Files Changed 10 +6 -31
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 05749b493a - Show all commits

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

@ -298,8 +298,6 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
store := h.userdataStore store := h.userdataStore
AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN) AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
if err != nil { if err != nil {
@ -336,6 +334,12 @@ func (h *Handlers) SaveFirstname(ctx context.Context, sym string, input []byte)
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
res.FlagReset = append(res.FlagReset, flag_allow_update)
res.FlagSet = append(res.FlagSet, flag_single_edit)
if len(input) > 0 { if len(input) > 0 {
firstName := string(input) firstName := string(input)
store := h.userdataStore store := h.userdataStore
@ -378,15 +382,6 @@ func (h *Handlers) SaveYob(ctx context.Context, sym string, input []byte) (resou
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
execPath := utils.GetSingleEditExecutionPath("save_yob")
isSingleEdit := utils.MatchNavigationPath(execPath, h.st.ExecPath)
if isSingleEdit {
res.FlagReset = append(res.FlagReset, flag_allow_update)
res.FlagSet = append(res.FlagSet, flag_single_edit)
}
if len(input) == 4 { if len(input) == 4 {
yob := string(input) yob := string(input)
store := h.userdataStore store := h.userdataStore
@ -407,17 +402,6 @@ func (h *Handlers) SaveLocation(ctx context.Context, sym string, input []byte) (
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
execPath := utils.GetSingleEditExecutionPath("save_location")
isSingleEdit := utils.MatchNavigationPath(execPath, h.st.ExecPath)
if isSingleEdit {
res.FlagReset = append(res.FlagReset, flag_allow_update)
res.FlagSet = append(res.FlagSet, flag_single_edit)
}
if len(input) > 0 { if len(input) > 0 {
location := string(input) location := string(input)
store := h.userdataStore store := h.userdataStore
@ -438,15 +422,6 @@ func (h *Handlers) SaveGender(ctx context.Context, sym string, input []byte) (re
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
flag_single_edit, _ := h.flagManager.GetFlag("flag_single_edit")
execPath := utils.GetSingleEditExecutionPath("select_gender")
isSingleEdit := utils.MatchNavigationPath(execPath, h.st.ExecPath)
if isSingleEdit {
res.FlagReset = append(res.FlagReset, flag_allow_update)
res.FlagSet = append(res.FlagSet, flag_single_edit)
}
code := codeFromCtx(ctx) code := codeFromCtx(ctx)
if len(input) > 0 { if len(input) > 0 {
gender := string(input) gender := string(input)