cmd/africastalking/main.go

@@ -131,7 +131,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx,pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
@@ -139,6 +139,12 @@ func main() {
 		os.Exit(1)
 	}
 
+	err = lhs.AdminStore.Seed()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/async/main.go

@@ -107,6 +107,12 @@ func main() {
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
+	err = lhs.AdminStore.Seed()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
 	accountService := server.AccountService{}
 
 	hl, err := lhs.GetHandler(&accountService)

cmd/http/main.go

@@ -92,7 +92,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
+	lhs, err := handlers.NewLocalHandlerService(ctx,pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
 	if err != nil {
@@ -100,6 +100,12 @@ func main() {
 		os.Exit(1)
 	}
 
+	err = lhs.AdminStore.Seed()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+	
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

cmd/main.go

@@ -97,6 +97,12 @@ func main() {
 		os.Exit(1)
 	}
 
+	err = lhs.AdminStore.Seed()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
 	accountService := server.AccountService{}
 	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {

devtools/commands/seed.go

@@ -1,47 +0,0 @@
-package commands
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/urdt/ussd/internal/utils"
-)
-
-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 := utils.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/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"context"
-	"log"
-
-	"git.grassecon.net/urdt/ussd/devtools/commands"
-)
-
-func main() {
-	ctx := context.Background()
-	err := commands.Seed(ctx)
-	if err != nil {
-		log.Fatalf("Failed to initialize a list of admins with error %s", err)
-	}
-
-}

internal/utils/adminstore.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"context"
+	"encoding/json"
+	"os"
 
 	"git.defalsify.org/vise.git/db"
 	fsdb "git.defalsify.org/vise.git/db/fs"
@@ -12,9 +14,17 @@ var (
 	logg = logging.NewVanilla().WithDomain("adminstore")
 )
 
+type Admin struct {
+	PhoneNumber string `json:"phonenumber"`
+}
+
+type Config struct {
+	Admins []Admin `json:"admins"`
+}
+
 type AdminStore struct {
 	ctx     context.Context
-	FsStore db.Db
+	fsStore db.Db
 }
 
 func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
@@ -22,7 +32,7 @@ func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &AdminStore{ctx: ctx, FsStore: fsStore}, nil
+	return &AdminStore{ctx: ctx, fsStore: fsStore}, nil
 }
 
 func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
@@ -35,9 +45,33 @@ func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
 	return fsStore, nil
 }
 
+// Seed initializes a list of phonenumbers with admin privileges
+func (as *AdminStore) Seed() error {
+	var config Config
+
+	store := as.fsStore
+	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(as.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
+}
+
 // 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))
+	_, 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")