urdt/ussd
5
0
Fork 0
Code Issues 50 Pull Requests 6 Actions 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 +49 -11
1 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be6c0d6afb - Show all commits

60
cmd/main.go
View File

@ -23,6 +23,7 @@ const (
USERFLAG_ACCOUNT_CREATED USERFLAG_ACCOUNT_CREATED
USERFLAG_ACCOUNT_PENDING USERFLAG_ACCOUNT_PENDING
lash marked this conversation as resolved
lash commented 2024-08-26 04:20:07 +02:00
Review
Copy Link

Please add a documentation line on each.

Please add a documentation line on each.
lash commented 2024-08-26 04:58:09 +02:00
Review
Copy Link

priority

**priority**
USERFLAG_ACCOUNT_SUCCESS USERFLAG_ACCOUNT_SUCCESS
USERFLAG_ACCOUNT_UNLOCKED
) )
const ( const (
@ -54,6 +55,7 @@ type trackStatusResponse struct {
type fsData struct { type fsData struct {
path string path string
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) {
@ -83,12 +85,24 @@ func (fsd *fsData) create_account(ctx context.Context, sym string, input []byte)
} }
f.Close() f.Close()
accountResp, err := createAccount() // accountResp, err := createAccount()
if err != nil { // if err != nil {
fmt.Println("Failed to create account:", err) // fmt.Println("Failed to create account:", err)
return res, err // return res, err
} // }
accountResp := accountResponse{
Ok: true,
Result: struct {
CustodialId json.Number `json:"custodialId"`
PublicKey string `json:"publicKey"`
TrackingId string `json:"trackingId"`
}{
CustodialId: "636",
PublicKey: "0x8d86F9D4A4eae41Dc3B68034895EA97BcA90e8c1",
TrackingId: "45c67314-7995-4890-89d6-e5af987754ac",
}}
accountData := map[string]string{ accountData := map[string]string{
"TrackingId": accountResp.Result.TrackingId, "TrackingId": accountResp.Result.TrackingId,
@ -131,6 +145,18 @@ func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte
return res, nil return res, nil
} }
func (fsd *fsData) unlock(ctx context.Context,sym string,input []byte) (resource.Result,error){
res := resource.Result{}
//res.FlagSet = []uint32{USERFLAG_ACCOUNT_UNLOCKED}
if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) {
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
} else {
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
}
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) 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) {
res := resource.Result{} res := resource.Result{}
fp := fsd.path + "_data" fp := fsd.path + "_data"
@ -156,13 +182,15 @@ func (fsd *fsData) check_account_status(ctx context.Context, sym string, input [
accountData["Status"] = status accountData["Status"] = status
if status == "SUCCESS" { if status == "SUCCESS" {
res.FlagSet = []uint32{USERFLAG_ACCOUNT_SUCCESS} res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS)
res.FlagReset = []uint32{USERFLAG_ACCOUNT_PENDING} res.FlagReset = append(res.FlagReset,USERFLAG_ACCOUNT_PENDING)
} else { } else {
res.FlagSet = []uint32{USERFLAG_ACCOUNT_PENDING} res.FlagReset = append(res.FlagSet, USERFLAG_ACCOUNT_SUCCESS)
res.FlagReset = []uint32{USERFLAG_ACCOUNT_SUCCESS} 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
@ -221,9 +249,17 @@ func checkAccountStatus(trackingId string) (string, error) {
} }
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) {
return resource.Result{ res := resource.Result{
Content: "", Content: "",
}, nil }
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)
}
return res, nil
} }
@ -283,11 +319,13 @@ func main() {
fp := path.Join(dp, sessionId) fp := path.Join(dp, sessionId)
fs := &fsData{ fs := &fsData{
path: fp, path: fp,
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("quit",fs.quit) rfs.AddLocalFunc("quit",fs.quit)
cont, err := en.Init(ctx) cont, err := en.Init(ctx)