refactor the membership handlers to use the backend package

Author: dstpierre

account.go

@@ -21,8 +21,7 @@ import (
 )
 
 type accounts struct {
-	membership *membership
-	log        *logger.Logger
+	log *logger.Logger
 }
 
 func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
@@ -158,7 +157,8 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 		pw = "devpw1234"
 	}
 
-	if _, _, err := a.membership.createAccountAndUser(dbName, email, pw, 100); err != nil {
+	mship := backend.Membership(base)
+	if _, _, err := mship.CreateAccountAndUser(email, pw, 100); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}

backend/backend.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"math/rand"
 	"strings"
 	"time"
 
@@ -26,31 +27,37 @@ import (
 	_ "github.com/lib/pq"
 )
 
-type Backend struct {
-	User func(baseID string) User
-	File func(model.Auth, model.DatabaseConfig) FileStore
-}
-
 var (
-	DB database.Persister
+	// Config reflect the configuration received on Setup
+	Config config.AppConfig
 
-	// Emailer sends email
+	// DB initialized Persister data store
+	DB database.Persister
+	// Emailer initialized Mailer for sending emails
 	Emailer email.Mailer
-	// Filestore store/load/delete file
+	// Filestore initialized Storer for raw save/delete blob file
 	Filestore storage.Storer
-
-	// Cache exposes the cache / pub-sub functionalities
+	// Cache initialized Volatilizer for cache and pub/sub
 	Cache cache.Volatilizer
-	// Log exposes the configured logger
+	// Log initialized Logger for all logging
 	Log *logger.Logger
+
+	// Membership exposes Account and User functionalities like register, login, etc
+	// account and user functionalities.
+	Membership func(model.DatabaseConfig) User
+
+	// Storage exposes file storage functionalities. It wraps the blob
+	// storage as well as the database storage.
+	Storage func(model.Auth, model.DatabaseConfig) FileStore
 )
 
-// New prepared the core services based on the configuration received.
-// It returns a Backend struct that wraps the Persister interface.
-func New(cfg config.AppConfig) Backend {
-	//TODO: this code is an awfuly copy of the server.go init code
-	// Might be an idea to create some kind of helper in the internal package
-	// that would return a structure with all the initialized services
+func init() {
+	rand.Seed(time.Now().UnixNano())
+}
+
+// Setup initializes the core services based on the configuration received.
+func Setup(cfg config.AppConfig) {
+	Config = cfg
 
 	Log = logger.Get(cfg)
 
@@ -129,10 +136,8 @@ func New(cfg config.AppConfig) Backend {
 	// start system events subscriber
 	go sub.Start()
 
-	return Backend{
-		User: newUser,
-		File: newFile,
-	}
+	Membership = newUser
+	Storage = newFile
 }
 
 func openMongoDatabase(dbHost string) (*mongodrv.Client, error) {

backend/backend_test.go

@@ -11,8 +11,6 @@ import (
 )
 
 var (
-	bkn backend.Backend
-
 	adminEmail    string
 	adminPassword string
 	adminAuth     model.Auth
@@ -34,7 +32,8 @@ func TestMain(t *testing.M) {
 		LocalStorageURL: "http://localhost:8099",
 	}
 
-	bkn = backend.New(cfg)
+	// initializes all core services basesd on config
+	backend.Setup(cfg)
 
 	setup()
 
@@ -77,36 +76,21 @@ func createTenantAndDatabase() error {
 }
 
 func createUser() error {
-	id, err := bkn.User(base.ID).CreateAccount(adminEmail)
-	if err != nil {
-		return err
-	}
-
-	userID, err := bkn.User(base.ID).CreateUserToken(id, adminEmail, adminPassword, 100)
+	mship := backend.Membership(base)
+	jwt, user, err := mship.CreateAccountAndUser(adminEmail, adminPassword, 100)
 	if err != nil {
 		return err
 	}
 
-	tok := model.User{
-		ID:        userID,
-		AccountID: id,
-		Email:     adminEmail,
-		Role:      100,
-		Created:   time.Now(),
-	}
-
 	adminAuth = model.Auth{
-		AccountID: id,
-		UserID:    userID,
+		AccountID: user.AccountID,
+		UserID:    user.ID,
 		Email:     adminEmail,
 		Role:      100,
-		Token:     tok.Token,
+		Token:     user.Token,
 	}
 
-	jwtToken, err = bkn.User(base.ID).Authenticate(adminEmail, adminPassword)
-	if err != nil {
-		return err
-	}
+	jwtToken = string(jwt)
 
 	return nil
 }