Compare commits

..

No commits in common. "94f12edeaf127896f4dc52e980964ed3ce944085" and "f90fde90fb70b3352f5bd5d5a110149f064c2ecc" have entirely different histories.

2 changed files with 8 additions and 12 deletions

View File

@ -105,7 +105,7 @@ func main() {
fp := path.Join(dp, sessionId) fp := path.Join(dp, sessionId)
ussdHandlers, err := ussd.NewHandlers(fp, &st,sessionId) ussdHandlers, err := ussd.NewHandlers(fp, &st)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "handler setup failed with error: %v\n", err) fmt.Fprintf(os.Stderr, "handler setup failed with error: %v\n", err)

View File

@ -24,7 +24,7 @@ import (
var ( var (
scriptDir = path.Join("services", "registration") scriptDir = path.Join("services", "registration")
translationDir = path.Join(scriptDir, "locale") translationDir = path.Join(scriptDir, "locale")
//dbFile = path.Join(scriptDir, "userdata.gdbm") dbFile = path.Join(scriptDir, "vise.gdbm")
) )
const ( const (
@ -65,9 +65,8 @@ type Handlers struct {
accountService server.AccountServiceInterface accountService server.AccountServiceInterface
} }
func NewHandlers(dir string, st *state.State, sessionId string) (*Handlers, error) { func NewHandlers(dir string, st *state.State) (*Handlers, error) {
filename := path.Join(scriptDir, sessionId+"_userdata.gdbm") db, err := gdbm.Open(dbFile, gdbm.ModeWrcreat)
db, err := gdbm.Open(filename, gdbm.ModeWrcreat)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -426,12 +425,9 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
res.FlagReset = append(res.FlagReset, flags["flag_account_authorized"]) res.FlagReset = append(res.FlagReset, flags["flag_account_authorized"])
return res, nil return res, nil
} }
} else {
res.FlagSet = append(res.FlagSet, flags["flag_incorrect_pin"])
res.FlagReset = append(res.FlagReset, flags["flag_account_authorized"])
} }
} else if errors.Is(err, gdbm.ErrItemNotFound) { } else if errors.Is(err, gdbm.ErrItemNotFound) {
return res, err //PIN not set yet
} else { } else {
return res, err return res, err
} }
@ -624,11 +620,11 @@ func (h *Handlers) TransactionReset(ctx context.Context, sym string, input []byt
err = h.db.Delete([]byte(Amount)) err = h.db.Delete([]byte(Amount))
if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) { if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) {
return res, err return res,err
} }
err = h.db.Delete([]byte(Recipient)) err = h.db.Delete([]byte(Recipient))
if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) { if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) {
return res, err return res,err
} }
res.FlagReset = append(res.FlagReset, flags["flag_invalid_recipient"], flags["flag_invalid_recipient_with_invite"]) res.FlagReset = append(res.FlagReset, flags["flag_invalid_recipient"], flags["flag_invalid_recipient_with_invite"])
@ -649,7 +645,7 @@ func (h *Handlers) ResetTransactionAmount(ctx context.Context, sym string, input
err = h.db.Delete([]byte(Amount)) err = h.db.Delete([]byte(Amount))
if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) { if err != nil && !errors.Is(err, gdbm.ErrItemNotFound) {
return res, err return res,err
} }
res.FlagReset = append(res.FlagReset, flags["flag_invalid_amount"]) res.FlagReset = append(res.FlagReset, flags["flag_invalid_amount"])