cmd/africastalking/main.go

@@ -22,8 +22,9 @@ import (
 	
 	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+
+	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )
 
 var (
@@ -120,8 +121,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := &httpremote.HTTPAccountService{}
-	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "httpaccountservice: %v\n", err)

cmd/async/main.go

@@ -17,7 +17,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
@@ -125,8 +125,7 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-
+	accountService := &httpremote.HTTPAccountService{}
-	accountService := services.New(ctx, menuStorageService, connData)
 
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {

cmd/http/main.go

@@ -21,7 +21,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
@@ -116,8 +116,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := &httpremote.HTTPAccountService{}
-	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -131,8 +130,6 @@ func main() {
 	}
 	defer stateStore.Close()
 
-	//accountService := services.New(ctx, menuStorageService, connData)
-
 	rp := &httprequest.DefaultRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httprequest.NewHTTPRequestHandler(bsh)

cmd/ssh/main.go

@@ -86,7 +86,7 @@ func main() {
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 	if stateDebug {
 		cfg.StateDebug = true

devtools/admin/admin_numbers.json

@@ -0,0 +1,7 @@
+{
+  "admins": [
+    {
+      "phonenumber" : "<replace with any admin number to test with >"
+    }
+   ]
+}

devtools/admin/commands/seed.go

@@ -0,0 +1,47 @@
+package commands
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type Admin struct {
+	PhoneNumber string `json:"phonenumber"`
+}
+
+type Config struct {
+	Admins []Admin `json:"admins"`
+}
+
+func Seed(ctx context.Context) error {
+	var config Config
+	adminstore, err := store.NewAdminStore(ctx, "../admin_numbers")
+	store := adminstore.FsStore
+	if err != nil {
+		return err
+	}
+	defer store.Close()
+	data, err := os.ReadFile("admin_numbers.json")
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(data, &config); err != nil {
+		return err
+	}
+	for _, admin := range config.Admins {
+		err := store.Put(ctx, []byte(admin.PhoneNumber), []byte("1"))
+		if err != nil {
+			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
+			return err
+		}
+	}
+	return nil
+}

devtools/admin/main.go

@@ -2,72 +2,16 @@ package main
 
 import (
 	"context"
-	"flag"
+	"log"
-	"fmt"
-	"os"
-	"path"
 
-	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/devtools/admin/commands"
-
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-)
-
-var (
-	logg = logging.NewVanilla().WithContextKey("SessionId")
-	scriptDir     = path.Join("services", "registration")
 )
 
 func main() {
-	config.LoadConfig()
-
-	var sessionId string
-	var connStr string
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.Parse()
-
-
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
-		os.Exit(1)
-	}
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
+	err := commands.Seed(ctx)
-
-	pfp := path.Join(scriptDir, "pp.csv")
-	flagParser, err := application.NewFlagManager(pfp)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "flagparser fail: %v\n", err)
+		log.Fatalf("Failed to initialize a list of admins with error %s", err)
-		os.Exit(1)
-	}
-
-	x := cmd.NewCmd(connData, sessionId, flagParser)
-	err = x.Parse(flag.Args())
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "conn", connData, "subcmd", x)
-
-	menuStorageService := storage.NewMenuStorageService(connData, "")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
-		os.Exit(1)
-	}
-
-	err = x.Exec(ctx, menuStorageService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmd exec error: %v\n", err)
-		os.Exit(1)
 	}
 
 }

handlers/application/menuhandler.go

@@ -40,10 +40,9 @@ var (
 	translationDir = path.Join(scriptDir, "locale")
 )
 
-// TODO: this is only in use in testing, should be moved to test domain and/or replaced by asm.FlagParser
 // FlagManager handles centralized flag management
 type FlagManager struct {
-	*asm.FlagParser
+	parser *asm.FlagParser
 }
 
 // NewFlagManager creates a new FlagManager instance
@@ -55,17 +54,13 @@ func NewFlagManager(csvPath string) (*FlagManager, error) {
 	}
 
 	return &FlagManager{
-		FlagParser: parser,
+		parser: parser,
 	}, nil
 }
 
-func (fm *FlagManager) SetDebug() {
-	fm.FlagParser = fm.FlagParser.WithDebug()
-}
-
 // GetFlag retrieves a flag value by its label
 func (fm *FlagManager) GetFlag(label string) (uint32, error) {
-	return fm.FlagParser.GetFlag(label)
+	return fm.parser.GetFlag(label)
 }
 
 type MenuHandlers struct {
@@ -73,7 +68,8 @@ type MenuHandlers struct {
 	st                   *state.State
 	ca                   cache.Memory
 	userdataStore        store.DataStore
-	flagManager          *FlagManager
+	adminstore           *store.AdminStore
+	flagManager          *asm.FlagParser
 	accountService       remote.AccountService
 	prefixDb             storedb.PrefixDb
 	profile              *profile.Profile
@@ -81,7 +77,7 @@ type MenuHandlers struct {
 }
 
 // NewHandlers creates a new instance of the Handlers struct with the provided dependencies.
-func NewMenuHandlers(appFlags *FlagManager, userdataStore db.Db, accountService remote.AccountService, replaceSeparatorFunc func(string) string) (*MenuHandlers, error) {
+func NewMenuHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *store.AdminStore, accountService remote.AccountService, replaceSeparatorFunc func(string) string) (*MenuHandlers, error) {
 	if userdataStore == nil {
 		return nil, fmt.Errorf("cannot create handler with nil userdata store")
 	}
@@ -96,6 +92,7 @@ func NewMenuHandlers(appFlags *FlagManager, userdataStore db.Db, accountService
 	h := &MenuHandlers{
 		userdataStore:        userDb,
 		flagManager:          appFlags,
+		adminstore:           adminstore,
 		accountService:       accountService,
 		prefixDb:             prefixDb,
 		profile:              &profile.Profile{Max: 6},
@@ -138,6 +135,15 @@ func (h *MenuHandlers) Init(ctx context.Context, sym string, input []byte) (reso
 		ctx = context.WithValue(ctx, "SessionId", sessionId)
 	}
 
+	flag_admin_privilege, _ := h.flagManager.GetFlag("flag_admin_privilege")
+	isAdmin, _ := h.adminstore.IsAdmin(sessionId)
+
+	if isAdmin {
+		r.FlagSet = append(r.FlagSet, flag_admin_privilege)
+	} else {
+		r.FlagReset = append(r.FlagReset, flag_admin_privilege)
+	}
+
 	if h.st == nil || h.ca == nil {
 		logg.ErrorCtxf(ctx, "perister fail in handler", "state", h.st, "cache", h.ca)
 		return r, fmt.Errorf("cannot get state and memory for handler")

handlers/application/menuhandler_test.go

@@ -14,11 +14,11 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/grassrootseconomics/common/pin"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/testservice"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.grassecon.net/grassrootseconomics/common/pin"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 
 	"github.com/alecthomas/assert/v2"
@@ -84,7 +84,7 @@ func TestNewMenuHandlers(t *testing.T) {
 
 	// Test case for valid UserDataStore
 	t.Run("Valid UserDataStore", func(t *testing.T) {
-		handlers, err := NewMenuHandlers(fm, store, &accountService, mockReplaceSeparator)
+		handlers, err := NewMenuHandlers(fm.parser, store, nil, &accountService, mockReplaceSeparator)
 		if err != nil {
 			t.Fatalf("expected no error, got %v", err)
 		}
@@ -108,7 +108,7 @@ func TestNewMenuHandlers(t *testing.T) {
 
 	// Test case for nil UserDataStore
 	t.Run("Nil UserDataStore", func(t *testing.T) {
-		handlers, err := NewMenuHandlers(fm, nil, &accountService, mockReplaceSeparator)
+		handlers, err := NewMenuHandlers(fm.parser, nil, nil, &accountService, mockReplaceSeparator)
 		if err == nil {
 			t.Fatal("expected an error, got none")
 		}
@@ -132,9 +132,16 @@ func TestInit(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 
+	adminstore, err := store.NewAdminStore(ctx, "admin_numbers")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
 	st := state.NewState(128)
 	ca := cache.NewCache()
 
+	flag_admin_privilege, _ := fm.GetFlag("flag_admin_privilege")
+
 	tests := []struct {
 		name           string
 		setup          func() (*MenuHandlers, context.Context)
@@ -154,40 +161,49 @@ func TestInit(t *testing.T) {
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession(sessionId).WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm,
+					flagManager: fm.parser,
+					adminstore:  adminstore,
 					pe:          pe,
 				}
 				return h, context.WithValue(ctx, "SessionId", sessionId)
 			},
-			input:          []byte("1"),
+			input: []byte("1"),
-			expectedResult: resource.Result{},
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_admin_privilege},
+			},
 		},
 		{
 			name: "Non-admin session initialization",
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession("0712345678").WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm,
+					flagManager: fm.parser,
+					adminstore:  adminstore,
 					pe:          pe,
 				}
 				return h, context.WithValue(context.Background(), "SessionId", "0712345678")
 			},
-			input:          []byte("1"),
+			input: []byte("1"),
-			expectedResult: resource.Result{},
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_admin_privilege},
+			},
 		},
 		{
 			name: "Move to top node on empty input",
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession(sessionId).WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm,
+					flagManager: fm.parser,
+					adminstore:  adminstore,
 					pe:          pe,
 				}
 				st.Code = []byte("some pending bytecode")
 				return h, context.WithValue(ctx, "SessionId", sessionId)
 			},
-			input:          []byte(""),
+			input: []byte(""),
-			expectedResult: resource.Result{},
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_admin_privilege},
+			},
 		},
 	}
 
@@ -240,7 +256,7 @@ func TestCreateAccount(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm,
+				flagManager:    fm.parser,
 			}
 
 			mockAccountService.On("CreateAccount").Return(tt.serverResponse, nil)
@@ -304,7 +320,7 @@ func TestSaveFirstname(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		st:            mockState,
 	}
 
@@ -349,7 +365,7 @@ func TestSaveFamilyname(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore: store,
 		st:            mockState,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 	}
 
 	// Call the method
@@ -392,7 +408,7 @@ func TestSaveYoB(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		st:            mockState,
 	}
 
@@ -436,7 +452,7 @@ func TestSaveLocation(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		st:            mockState,
 	}
 
@@ -480,7 +496,7 @@ func TestSaveOfferings(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		st:            mockState,
 	}
 
@@ -548,7 +564,7 @@ func TestSaveGender(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore: store,
 				st:            mockState,
-				flagManager:   fm,
+				flagManager:   fm.parser,
 			}
 
 			expectedResult := resource.Result{}
@@ -579,11 +595,11 @@ func TestSaveTemporaryPin(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
+	flag_incorrect_pin, _ := fm.parser.GetFlag("flag_incorrect_pin")
 
 	// Create the MenuHandlers instance with the mock flag manager
 	h := &MenuHandlers{
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		userdataStore: store,
 	}
 
@@ -796,7 +812,7 @@ func TestSetLanguage(t *testing.T) {
 
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager:   fm,
+				flagManager:   fm.parser,
 				userdataStore: store,
 				st:            mockState,
 			}
@@ -830,7 +846,7 @@ func TestResetAllowUpdate(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
+	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
 
 	// Define test cases
 	tests := []struct {
@@ -851,7 +867,7 @@ func TestResetAllowUpdate(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm,
+				flagManager: fm.parser,
 			}
 
 			// Call the method
@@ -872,7 +888,7 @@ func TestResetAccountAuthorized(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")
+	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
 
 	// Define test cases
 	tests := []struct {
@@ -893,7 +909,7 @@ func TestResetAccountAuthorized(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm,
+				flagManager: fm.parser,
 			}
 
 			// Call the method
@@ -917,8 +933,8 @@ func TestIncorrectPinReset(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
+	flag_incorrect_pin, _ := fm.parser.GetFlag("flag_incorrect_pin")
-	flag_account_blocked, _ := fm.GetFlag("flag_account_blocked")
+	flag_account_blocked, _ := fm.parser.GetFlag("flag_account_blocked")
 
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
@@ -976,7 +992,7 @@ func TestIncorrectPinReset(t *testing.T) {
 
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager:   fm,
+				flagManager:   fm.parser,
 				userdataStore: store,
 			}
 
@@ -998,7 +1014,7 @@ func TestResetIncorrectYob(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_date_format, _ := fm.GetFlag("flag_incorrect_date_format")
+	flag_incorrect_date_format, _ := fm.parser.GetFlag("flag_incorrect_date_format")
 
 	// Define test cases
 	tests := []struct {
@@ -1019,7 +1035,7 @@ func TestResetIncorrectYob(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm,
+				flagManager: fm.parser,
 			}
 
 			// Call the method
@@ -1057,7 +1073,7 @@ func TestAuthorize(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		st:             mockState,
 	}
 
@@ -1125,12 +1141,12 @@ func TestVerifyYob(t *testing.T) {
 	// Create required mocks
 	mockAccountService := new(mocks.MockAccountService)
 	mockState := state.NewState(16)
-	flag_incorrect_date_format, _ := fm.GetFlag("flag_incorrect_date_format")
+	flag_incorrect_date_format, _ := fm.parser.GetFlag("flag_incorrect_date_format")
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	h := &MenuHandlers{
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		st:             mockState,
 	}
 
@@ -1190,14 +1206,14 @@ func TestVerifyCreatePin(t *testing.T) {
 	mockAccountService := new(mocks.MockAccountService)
 	mockState := state.NewState(16)
 
-	flag_valid_pin, _ := fm.GetFlag("flag_valid_pin")
+	flag_valid_pin, _ := fm.parser.GetFlag("flag_valid_pin")
-	flag_pin_mismatch, _ := fm.GetFlag("flag_pin_mismatch")
+	flag_pin_mismatch, _ := fm.parser.GetFlag("flag_pin_mismatch")
-	flag_pin_set, _ := fm.GetFlag("flag_pin_set")
+	flag_pin_set, _ := fm.parser.GetFlag("flag_pin_set")
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		st:             mockState,
 	}
 
@@ -1291,7 +1307,7 @@ func TestCheckAccountStatus(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm,
+				flagManager:    fm.parser,
 			}
 
 			err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(tt.publicKey))
@@ -1331,7 +1347,7 @@ func TestTransactionReset(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 	}
 	tests := []struct {
 		name           string
@@ -1371,14 +1387,14 @@ func TestResetTransactionAmount(t *testing.T) {
 		t.Logf(err.Error())
 	}
 
-	flag_invalid_amount, _ := fm.GetFlag("flag_invalid_amount")
+	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 	}
 
 	tests := []struct {
@@ -1415,14 +1431,14 @@ func TestInitiateTransaction(t *testing.T) {
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	account_authorized_flag, _ := fm.GetFlag("flag_account_authorized")
+	account_authorized_flag, _ := fm.parser.GetFlag("flag_account_authorized")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 	}
 
 	tests := []struct {
@@ -1508,7 +1524,7 @@ func TestQuit(t *testing.T) {
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")
+	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
 
 	mockAccountService := new(mocks.MockAccountService)
 
@@ -1518,7 +1534,7 @@ func TestQuit(t *testing.T) {
 
 	h := &MenuHandlers{
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 	}
 	tests := []struct {
 		name           string
@@ -1561,14 +1577,14 @@ func TestValidateAmount(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	flag_invalid_amount, _ := fm.GetFlag("flag_invalid_amount")
+	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 	}
 	tests := []struct {
 		name           string
@@ -1635,8 +1651,8 @@ func TestValidateRecipient(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	flag_invalid_recipient, _ := fm.GetFlag("flag_invalid_recipient")
+	flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
-	flag_invalid_recipient_with_invite, _ := fm.GetFlag("flag_invalid_recipient_with_invite")
+	flag_invalid_recipient_with_invite, _ := fm.parser.GetFlag("flag_invalid_recipient_with_invite")
 
 	// Define test cases
 	tests := []struct {
@@ -1688,7 +1704,7 @@ func TestValidateRecipient(t *testing.T) {
 			mockAccountService := new(mocks.MockAccountService)
 			// Create the MenuHandlers instance
 			h := &MenuHandlers{
-				flagManager:    fm,
+				flagManager:    fm.parser,
 				userdataStore:  store,
 				accountService: mockAccountService,
 			}
@@ -1851,10 +1867,10 @@ func TestVerifyNewPin(t *testing.T) {
 
 	fm, _ := NewFlagManager(flagsPath)
 
-	flag_valid_pin, _ := fm.GetFlag("flag_valid_pin")
+	flag_valid_pin, _ := fm.parser.GetFlag("flag_valid_pin")
 	mockAccountService := new(mocks.MockAccountService)
 	h := &MenuHandlers{
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		accountService: mockAccountService,
 	}
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
@@ -1897,11 +1913,11 @@ func TestConfirmPin(t *testing.T) {
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	fm, _ := NewFlagManager(flagsPath)
-	flag_pin_mismatch, _ := fm.GetFlag("flag_pin_mismatch")
+	flag_pin_mismatch, _ := fm.parser.GetFlag("flag_pin_mismatch")
 	mockAccountService := new(mocks.MockAccountService)
 	h := &MenuHandlers{
 		userdataStore:  store,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		accountService: mockAccountService,
 	}
 
@@ -2031,7 +2047,7 @@ func TestSetDefaultVoucher(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm,
+				flagManager:    fm.parser,
 			}
 
 			err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
@@ -2139,7 +2155,7 @@ func TestViewVoucher(t *testing.T) {
 
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm,
+		flagManager:   fm.parser,
 		prefixDb:      spdb,
 	}
 
@@ -2212,7 +2228,7 @@ func TestGetVoucherDetails(t *testing.T) {
 
 	h := &MenuHandlers{
 		userdataStore:  store,
-		flagManager:    fm,
+		flagManager:    fm.parser,
 		accountService: mockAccountService,
 	}
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS, []byte(tokA_AAddress))

handlers/local.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"strings"
 
+	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
@@ -11,35 +12,47 @@ import (
 
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 )
 
 type HandlerService interface {
 	GetHandler() (*application.MenuHandlers, error)
 }
 
+func getParser(fp string, debug bool) (*asm.FlagParser, error) {
+	flagParser := asm.NewFlagParser().WithDebug()
+	_, err := flagParser.Load(fp)
+	if err != nil {
+		return nil, err
+	}
+	return flagParser, nil
+}
+
 type LocalHandlerService struct {
-	Parser        *application.FlagManager
+	Parser        *asm.FlagParser
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
+	AdminStore    *store.AdminStore
 	Cfg           engine.Config
 	Rs            resource.Resource
 }
 
 func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
-	parser, err := application.NewFlagManager(fp)
+	parser, err := getParser(fp, debug)
 	if err != nil {
 		return nil, err
 	}
-	if debug {
+	adminstore, err := store.NewAdminStore(ctx, "admin_numbers")
-		parser.SetDebug()
+	if err != nil {
+		return nil, err
 	}
-
 	return &LocalHandlerService{
-		Parser: parser,
+		Parser:     parser,
-		DbRs:   dbResource,
+		DbRs:       dbResource,
-		Cfg:    cfg,
+		AdminStore: adminstore,
-		Rs:     rs,
+		Cfg:        cfg,
+		Rs:         rs,
 	}, nil
 }
 
@@ -56,7 +69,7 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}
 
-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}

internal/cmd/cmd.go

@@ -1,99 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("cmd").WithContextKey("SessionId")
-)
-
-type Cmd struct {
-	sessionId string
-	conn storage.ConnData
-	flagParser *application.FlagManager
-	cmd int
-	enable bool
-	exec func(ctx context.Context, ss storage.StorageService) error
-}
-
-func NewCmd(conn storage.ConnData, sessionId string, flagParser *application.FlagManager) *Cmd {
-	return &Cmd{
-		conn: conn,
-		sessionId: sessionId,
-		flagParser: flagParser,
-	}
-}
-
-func (c *Cmd) Exec(ctx context.Context, ss storage.StorageService) error {
-	return c.exec(ctx, ss)
-}
-
-func (c *Cmd) execAdmin(ctx context.Context, ss storage.StorageService) error {
-	pe, err := ss.GetPersister(ctx)
-	if err != nil {
-		return err
-	}
-	err = pe.Load(c.sessionId)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err := pe.Save(c.sessionId)
-		if err != nil {
-			logg.ErrorCtxf(ctx, "failed persister save: %v", err)
-		}
-	}()
-
-	st := pe.GetState()
-	flag, err := c.flagParser.GetFlag("flag_admin_privilege")
-	if err != nil {
-		return err
-	}
-	if c.enable {
-		logg.InfoCtxf(ctx, "setting admin flag", "flag", flag)
-		st.SetFlag(flag)
-	} else {
-		st.ResetFlag(flag)
-	}
-	return nil
-}
-
-func (c *Cmd) parseCmdAdmin(cmd string, param string, more []string) (bool, error) {
-	if cmd == "admin" {
-		if param == "1" {
-			c.enable = true
-		} else if param != "0" {
-			return false, fmt.Errorf("invalid parameter: %v", param)
-		}
-		c.exec = c.execAdmin
-		return true, nil
-	}
-	return false, nil
-}
-
-func (c *Cmd) Parse(args []string) error {
-	if len(args) < 2 {
-		return fmt.Errorf("Wrong number of arguments: %v", args)
-	}
-	cmd := args[0]
-	param := args[1]
-	args = args[2:]
-
-	r, err := c.parseCmdAdmin(cmd, param, args)
-	if err != nil {
-		return err
-	}
-	if r {
-		return nil
-	}
-
-	return fmt.Errorf("unknown subcommand: %s", cmd)
-}
-
-

services/registration/account_pending

@@ -1 +1 @@
-Your account is still being created. For more help, please call: 0757628885
+Your account is still being created.

services/registration/account_pending_swa

@@ -1 +1 @@
-Akaunti yako bado inatengenezwa. Kwa usaidizi zaidi, piga: 0757628885
+Akaunti yako bado inatengenezwa

ssh/keystore.go

@@ -44,8 +44,6 @@ func(s *SshKeyStore) AddFromFile(ctx context.Context, fp string, sessionId strin
 		return fmt.Errorf("Failed to parse public key: %v", err)
 	}
 	k := append([]byte{0x01}, pubKey.Marshal()...)
-	s.store.SetLanguage(nil)
-	s.store.SetSession("")
 	s.store.SetPrefix(storage.DATATYPE_EXTEND)
 	logg.Infof("Added key", "sessionId", sessionId, "public key", string(publicBytes))
 	return s.store.Put(ctx, k, []byte(sessionId))
@@ -53,7 +51,6 @@ func(s *SshKeyStore) AddFromFile(ctx context.Context, fp string, sessionId strin
 
 func(s *SshKeyStore) Get(ctx context.Context, pubKey ssh.PublicKey) (string, error) {
 	s.store.SetLanguage(nil)
-	s.store.SetSession("")
 	s.store.SetPrefix(storage.DATATYPE_EXTEND)
 	k := append([]byte{0x01}, pubKey.Marshal()...)
 	v, err := s.store.Get(ctx, k)

ssh/ssh.go

@@ -17,7 +17,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
@@ -180,8 +180,7 @@ func(s *SshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) {
 	}
 
 	// TODO: clear up why pointer here and by-value other cmds
-	accountService := services.New(ctx, menuStorageService, s.Conn)
+	accountService := &httpremote.HTTPAccountService{}
-
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		return nil, nil, err

store/adminstore.go

@@ -0,0 +1,51 @@
+package store
+
+import (
+	"context"
+
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type AdminStore struct {
+	ctx     context.Context
+	FsStore db.Db
+}
+
+func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
+	fsStore, err := getFsStore(ctx, fileName)
+	if err != nil {
+		return nil, err
+	}
+	return &AdminStore{ctx: ctx, FsStore: fsStore}, nil
+}
+
+func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
+	fsStore := fsdb.NewFsDb()
+	err := fsStore.Connect(ctx, connectStr)
+	fsStore.SetPrefix(db.DATATYPE_USERDATA)
+	if err != nil {
+		return nil, err
+	}
+	return fsStore, nil
+}
+
+// Checks if the given sessionId is listed as an admin.
+func (as *AdminStore) IsAdmin(sessionId string) (bool, error) {
+	_, err := as.FsStore.Get(as.ctx, []byte(sessionId))
+	if err != nil {
+		if db.IsNotFound(err) {
+			logg.Printf(logging.LVL_INFO, "Returning false because session id was not found")
+			return false, nil
+		} else {
+			return false, err
+		}
+	}
+
+	return true, nil
+}

store/vouchers.go

@@ -6,15 +6,10 @@ import (
 	"math/big"
 	"strings"
 
-	"git.defalsify.org/vise.git/logging"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
-var (
-	logg = logging.NewVanilla().WithDomain("vouchers").WithContextKey("SessionId")
-)
-
 // VoucherMetadata helps organize data fields
 type VoucherMetadata struct {
 	Symbols   string