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

wip-account-creation #4

Merged
lash merged 143 commits from wip-account-creation into master 2024-08-30 14:37:58 +02:00
Conversation 0 Commits 143 Files Changed 182 +113 -45
12 changed files with 113 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80ff5c477f - Show all commits

128
cmd/main.go
View File

@ -26,6 +26,7 @@ const (
USERFLAG_ACCOUNT_UNLOCKED USERFLAG_ACCOUNT_UNLOCKED
invalidRecipient invalidRecipient
invalidRecipientWithInvite invalidRecipientWithInvite
USERFLAG_INCORRECTPIN
) )
const ( const (
@ -66,7 +67,7 @@ type balanceResponse struct {
type fsData struct { type fsData struct {
path string path string
st *state.State st *state.State
} }
func (fsd *fsData) SetLanguageSelected(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (fsd *fsData) SetLanguageSelected(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@ -104,16 +105,16 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
// } // }
accountResp := accountResponse{ accountResp := accountResponse{
Ok: true, Ok: true,
Result: struct { Result: struct {
CustodialId json.Number `json:"custodialId"` CustodialId json.Number `json:"custodialId"`
PublicKey string `json:"publicKey"` PublicKey string `json:"publicKey"`
TrackingId string `json:"trackingId"` TrackingId string `json:"trackingId"`
}{ }{
CustodialId: "636", CustodialId: "636",
PublicKey: "0x8d86F9D4A4eae41Dc3B68034895EA97BcA90e8c1", PublicKey: "0x8d86F9D4A4eae41Dc3B68034895EA97BcA90e8c1",
TrackingId: "45c67314-7995-4890-89d6-e5af987754ac", TrackingId: "45c67314-7995-4890-89d6-e5af987754ac",
}} }}
accountData := map[string]string{ accountData := map[string]string{
"TrackingId": accountResp.Result.TrackingId, "TrackingId": accountResp.Result.TrackingId,
@ -131,8 +132,7 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
if err != nil { if err != nil {
return res, err return res, err
} }
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_CREATED)
res.FlagSet = []uint32{USERFLAG_ACCOUNT_CREATED}
return res, err return res, err
} }
@ -156,16 +156,33 @@ func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte
return res, nil return res, nil
} }
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-08-26 03:56:12 +02:00
Outdated
Review
Copy Link

This code is repeated many times. Could we please abstract the json fs part of the get and set to a module implementing an interface with Get and Put?

This code is repeated many times. Could we please abstract the json fs part of the get and set to a module implementing an interface with `Get` and `Put`?
func (fsd *fsData) unLock(ctx context.Context, sym string, input []byte) (resource.Result, error) {
func (fsd *fsData) unlock(ctx context.Context,sym string,input []byte) (resource.Result,error){
res := resource.Result{} res := resource.Result{}
//res.FlagSet = []uint32{USERFLAG_ACCOUNT_UNLOCKED} pin := string(input)
if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) { if len(input) > 0 {
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED) if pin == "0000" {
} else { res.FlagSet = append(res.FlagSet, USERFLAG_INCORRECTPIN)
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
return res, nil
}
if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) {
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-08-26 03:53:38 +02:00
Outdated
Review
Copy Link

perhaps check this input, 2 or 4 digits, numeric

perhaps check this input, 2 or 4 digits, numeric
lash commented 2024-08-26 04:58:33 +02:00
Outdated
Review
Copy Link

priority

**priority**
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
} else {
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
}
} }
return res,nil return res, nil
}
func (fsd *fsData) ResetIncorrectPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
res := resource.Result{}
isIncorrectPinSet := fsd.st.MatchFlag(USERFLAG_INCORRECTPIN, true)
if isIncorrectPinSet {
res.FlagReset = append(res.FlagReset, USERFLAG_INCORRECTPIN)
} else {
res.FlagReset = append(res.FlagReset, USERFLAG_INCORRECTPIN)
}
return res, nil
} }
func (fsd *fsData) check_account_status(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (fsd *fsData) check_account_status(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@ -192,16 +209,14 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [
accountData["Status"] = status accountData["Status"] = status
if status == "SUCCESS" { if status == "REVERTED" {
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS) res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS)
res.FlagReset = append(res.FlagReset,USERFLAG_ACCOUNT_PENDING) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
} else { } else {
res.FlagReset = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS) res.FlagReset = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS)
res.FlagSet = append(res.FlagReset,USERFLAG_ACCOUNT_PENDING) res.FlagSet = append(res.FlagReset, USERFLAG_ACCOUNT_PENDING)
} }
updatedJsonData, err := json.Marshal(accountData) updatedJsonData, err := json.Marshal(accountData)
if err != nil { if err != nil {
return res, err return res, err
@ -259,17 +274,11 @@ func checkAccountStatus(trackingId string) (string, error) {
return status, nil return status, nil
} }
func (fsd *fsData) quit(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (fsd *fsData) quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
res := resource.Result{ res := resource.Result{
Content: "", Content: "Your account is being created",
}
st := fsd.st
if(st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED,true)){
//res.FlagReset = []uint32{USERFLAG_ACCOUNT_UNLOCKED}
// res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
}else {
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
} }
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
lash commented 2024-08-26 03:59:31 +02:00
Outdated
Review
Copy Link

this shouldnt switch on the input string; that requires manual syncing between here and the menu code.

how about using INCMP and the language switches on the sym instead?

Have a look at the lash/reuse-example go-vise branch, I've added an example that might illustrate.

this shouldnt switch on the input string; that requires manual syncing between here and the menu code. how about using INCMP and the language switches on the sym instead? Have a look at the `lash/reuse-example` go-vise branch, I've added an example that might illustrate.
lash commented 2024-08-26 04:58:41 +02:00
Outdated
Review
Copy Link

priority

**priority**
lash commented 2024-08-29 16:19:53 +02:00
Outdated
Review
Copy Link

I see this still isn't resolved.

I will make an issue of this, and mark it priority. We will handle it after merge.

I see this still isn't resolved. I will make an issue of this, and mark it priority. We will handle it after merge.
return res, nil return res, nil
} }
@ -480,6 +489,44 @@ func (fsd *fsData) get_sender(ctx context.Context, sym string, input []byte) (re
return res, nil return res, nil
} }
func (fsd *fsData) quitWithBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
res := resource.Result{
}
fp := fsd.path + "_data"
jsonData, err := os.ReadFile(fp)
if err != nil {
return res, err
}
var accountData map[string]string
err = json.Unmarshal(jsonData, &accountData)
if err != nil {
return res, err
}
resp, err := http.Get(checkBalanceURL + accountData["PublicKey"])
if err != nil {
return res, nil
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
return res, nil
}
var balanceResp balanceResponse
err = json.Unmarshal(body, &balanceResp)
if err != nil {
return res, nil
}
balance := balanceResp.Result.Balance
res.Content = fmt.Sprintf("Your account balance is: %s", balance)
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
return res, nil
}
var ( var (
scriptDir = path.Join("services", "registration") scriptDir = path.Join("services", "registration")
) )
@ -497,12 +544,13 @@ func main() {
fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir) fmt.Fprintf(os.Stderr, "starting session at symbol '%s' using resource dir: %s\n", root, dir)
ctx := context.Background() ctx := context.Background()
st := state.NewState(7) st := state.NewState(9)
st.UseDebug() st.UseDebug()
state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE") state.FlagDebugger.Register(USERFLAG_LANGUAGE_SET, "LANGUAGE_CHANGE")
state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED") state.FlagDebugger.Register(USERFLAG_ACCOUNT_CREATED, "ACCOUNT_CREATED")
state.FlagDebugger.Register(USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS") state.FlagDebugger.Register(USERFLAG_ACCOUNT_SUCCESS, "ACCOUNT_SUCCESS")
state.FlagDebugger.Register(USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING") state.FlagDebugger.Register(USERFLAG_ACCOUNT_PENDING, "ACCOUNT_PENDING")
state.FlagDebugger.Register(USERFLAG_INCORRECTPIN, "INCORRECTPIN")
rfs := resource.NewFsResource(scriptDir) rfs := resource.NewFsResource(scriptDir)
ca := cache.NewCache() ca := cache.NewCache()
@ -519,6 +567,7 @@ func main() {
} }
pr := persist.NewFsPersister(dp) pr := persist.NewFsPersister(dp)
en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs) en, err := engine.NewPersistedEngine(ctx, cfg, pr, rfs)
if err != nil { if err != nil {
pr = pr.WithContent(&st, ca) pr = pr.WithContent(&st, ca)
err = pr.Save(cfg.SessionId) err = pr.Save(cfg.SessionId)
@ -535,13 +584,13 @@ func main() {
fp := path.Join(dp, sessionId) fp := path.Join(dp, sessionId)
fs := &fsData{ fs := &fsData{
path: fp, path: fp,
st: &st, st: &st,
} }
rfs.AddLocalFunc("select_language", fs.SetLanguageSelected) rfs.AddLocalFunc("select_language", fs.SetLanguageSelected)
rfs.AddLocalFunc("create_account", fs.create_account) rfs.AddLocalFunc("create_account", fs.create_account)
rfs.AddLocalFunc("check_identifier", fs.checkIdentifier) rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
rfs.AddLocalFunc("check_account_status", fs.check_account_status) rfs.AddLocalFunc("check_account_status", fs.check_account_status)
rfs.AddLocalFunc("unlock_account", fs.unlock) rfs.AddLocalFunc("unlock_account", fs.unLock)
rfs.AddLocalFunc("quit", fs.quit) rfs.AddLocalFunc("quit", fs.quit)
rfs.AddLocalFunc("check_balance", fs.checkBalance) rfs.AddLocalFunc("check_balance", fs.checkBalance)
rfs.AddLocalFunc("validate_recipient", fs.validate_recipient) rfs.AddLocalFunc("validate_recipient", fs.validate_recipient)
@ -550,8 +599,11 @@ func main() {
rfs.AddLocalFunc("validate_amount", fs.validate_amount) rfs.AddLocalFunc("validate_amount", fs.validate_amount)
rfs.AddLocalFunc("get_recipient", fs.get_recipient) rfs.AddLocalFunc("get_recipient", fs.get_recipient)
rfs.AddLocalFunc("get_sender", fs.get_sender) rfs.AddLocalFunc("get_sender", fs.get_sender)
rfs.AddLocalFunc("reset_incorrect", fs.ResetIncorrectPin)
rfs.AddLocalFunc("quit_with_balance",fs.quitWithBalance)
cont, err := en.Init(ctx) cont, err := en.Init(ctx)
en.SetDebugger(engine.NewSimpleDebug(nil))
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err) fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
os.Exit(1) os.Exit(1)

3
services/registration/account_creation.vis
View File

@ -1,3 +1,4 @@
LOAD create_account 0 LOAD create_account 0
LOAD quit 0
HALT HALT
MOVE quit

2
services/registration/balances.vis
View File

@ -4,5 +4,5 @@ MOUT back 0
HALT HALT
INCMP ^ 0 INCMP ^ 0
INCMP my_balance 1 INCMP my_balance 1
INCMP my_community_balance 2 INCMP community_balance 2

0
services/registration/my_comminity_balance_swa → services/registration/comminity_balance_swa
View File

0
services/registration/my_community_balance → services/registration/community_balance
View File

6
services/registration/community_balance.vis Normal file
View File

@ -0,0 +1,6 @@
LOAD reset_incorrect 0
CATCH incorrect_pin 15 1
CATCH pin_entry 12 0
LOAD quit_with_balance 0
HALT

2
services/registration/enter_pin.vis
View File

@ -1,4 +1,4 @@
MOUT back 0 MOUT back 0
HALT HALT
INCMP ^ 0 INCMP _ 0
INCMP display_profile_info * INCMP display_profile_info *

1
services/registration/incorrect_pin Normal file
View File

@ -0,0 +1 @@
Incorrect pin

7
services/registration/incorrect_pin.vis Normal file
View File

@ -0,0 +1,7 @@
LOAD reset_incorrect 0
RELOAD reset_incorrect
MOUT retry 1
MOUT quit 9
HALT
INCMP _ 1
INCMP quit 9

1
services/registration/incorrect_pin_swa Normal file
View File

@ -0,0 +1 @@
PIN ulioeka sio sahihi

5
services/registration/my_balance.vis
View File

@ -1,3 +1,6 @@
LOAD reset_incorrect 0
CATCH incorrect_pin 15 1
CATCH pin_entry 12 0 CATCH pin_entry 12 0
LOAD quit_with_balance 0
HALT HALT
MOVE quit

3
services/registration/my_community_balance.vis
View File

@ -1,3 +0,0 @@
CATCH pin_entry 12 0
HALT
MOVE quit