Refine again

message/cache_postgres.go

@@ -103,7 +103,7 @@ var pgQueries = queries{
 
 // NewPostgresStore creates a new PostgreSQL-backed message cache store using an existing database connection pool.
 func NewPostgresStore(db *sql.DB, batchSize int, batchTimeout time.Duration) (*Cache, error) {
-	if err := setupPostgresDB(db); err != nil {
+	if err := setupPostgres(db); err != nil {
 		return nil, err
 	}
 	return newCache(db, pgQueries, nil, batchSize, batchTimeout, false), nil

message/cache_postgres_schema.go

@@ -60,7 +60,7 @@ const (
 	postgresSelectSchemaVersionQuery = `SELECT version FROM schema_version WHERE store = 'message'`
 )
 
-func setupPostgresDB(db *sql.DB) error {
+func setupPostgres(db *sql.DB) error {
 	var schemaVersion int
 	err := db.QueryRow(postgresSelectSchemaVersionQuery).Scan(&schemaVersion)
 	if err != nil {

user/manager.go

@@ -57,19 +57,25 @@ type Manager struct {
 
 var _ Auther = (*Manager)(nil)
 
-// initManager sets defaults and runs startup tasks common to all backends
-func initManager(manager *Manager) error {
-	if manager.config.BcryptCost <= 0 {
-		manager.config.BcryptCost = DefaultUserPasswordBcryptCost
+func newManager(db *sql.DB, queries queries, config *Config) (*Manager, error) {
+	if config.BcryptCost <= 0 {
+		config.BcryptCost = DefaultUserPasswordBcryptCost
 	}
-	if manager.config.QueueWriterInterval.Seconds() <= 0 {
-		manager.config.QueueWriterInterval = DefaultUserStatsQueueWriterInterval
+	if config.QueueWriterInterval.Seconds() <= 0 {
+		config.QueueWriterInterval = DefaultUserStatsQueueWriterInterval
+	}
+	manager := &Manager{
+		config:     config,
+		db:         db,
+		statsQueue: make(map[string]*Stats),
+		tokenQueue: make(map[string]*TokenUpdate),
+		queries:    queries,
 	}
 	if err := manager.maybeProvisionUsersAccessAndTokens(); err != nil {
-		return err
+		return nil, err
 	}
 	go manager.asyncQueueWriter(manager.config.QueueWriterInterval)
-	return nil
+	return manager, nil
 }
 
 // Authenticate checks username and password and returns a User if correct, and the user has not been

user/manager_postgres.go

@@ -204,17 +204,7 @@ const (
 )
 
 // NewPostgresManager creates a new Manager backed by a PostgreSQL database using an existing connection pool.
-func NewPostgresManager(db *sql.DB, config *Config) (*Manager, error) {
-	if err := setupPostgres(db); err != nil {
-		return nil, err
-	}
-	manager := &Manager{
-		config:     config,
-		db:         db,
-		statsQueue: make(map[string]*Stats),
-		tokenQueue: make(map[string]*TokenUpdate),
-		queries: queries{
-			// User queries
+var postgresQueries = queries{
 	selectUserByID:               postgresSelectUserByIDQuery,
 	selectUserByName:             postgresSelectUserByNameQuery,
 	selectUserByToken:            postgresSelectUserByTokenQuery,
@@ -234,8 +224,6 @@ func NewPostgresManager(db *sql.DB, config *Config) (*Manager, error) {
 	deleteUser:                   postgresDeleteUserQuery,
 	deleteUserTier:               postgresDeleteUserTierQuery,
 	deleteUsersMarked:            postgresDeleteUsersMarkedQuery,
-
-			// Access queries
 	selectTopicPerms:             postgresSelectTopicPermsQuery,
 	selectUserAllAccess:          postgresSelectUserAllAccessQuery,
 	selectUserAccess:             postgresSelectUserAccessQuery,
@@ -249,8 +237,6 @@ func NewPostgresManager(db *sql.DB, config *Config) (*Manager, error) {
 	deleteUserAccessProvisioned:  postgresDeleteUserAccessProvisionedQuery,
 	deleteTopicAccess:            postgresDeleteTopicAccessQuery,
 	deleteAllAccess:              postgresDeleteAllAccessQuery,
-
-			// Token queries
 	selectToken:                  postgresSelectTokenQuery,
 	selectTokens:                 postgresSelectTokensQuery,
 	selectTokenCount:             postgresSelectTokenCountQuery,
@@ -263,26 +249,22 @@ func NewPostgresManager(db *sql.DB, config *Config) (*Manager, error) {
 	deleteAllToken:               postgresDeleteAllTokenQuery,
 	deleteExpiredTokens:          postgresDeleteExpiredTokensQuery,
 	deleteExcessTokens:           postgresDeleteExcessTokensQuery,
-
-			// Tier queries
 	insertTier:                   postgresInsertTierQuery,
 	selectTiers:                  postgresSelectTiersQuery,
 	selectTierByCode:             postgresSelectTierByCodeQuery,
 	selectTierByPriceID:          postgresSelectTierByPriceIDQuery,
 	updateTier:                   postgresUpdateTierQuery,
 	deleteTier:                   postgresDeleteTierQuery,
-
-			// Phone queries
 	selectPhoneNumbers:           postgresSelectPhoneNumbersQuery,
 	insertPhoneNumber:            postgresInsertPhoneNumberQuery,
 	deletePhoneNumber:            postgresDeletePhoneNumberQuery,
-
-			// Billing queries
 	updateBilling:                postgresUpdateBillingQuery,
-		},
 }
-	if err := initManager(manager); err != nil {
+
+// NewPostgresManager creates a new Manager backed by a PostgreSQL database
+func NewPostgresManager(db *sql.DB, config *Config) (*Manager, error) {
+	if err := setupPostgres(db); err != nil {
 		return nil, err
 	}
-	return manager, nil
+	return newManager(db, postgresQueries, config)
 }

user/manager_sqlite.go

@@ -201,28 +201,7 @@ const (
 	`
 )
 
-// NewSQLiteManager creates a new Manager backed by a SQLite database
-func NewSQLiteManager(filename, startupQueries string, config *Config) (*Manager, error) {
-	parentDir := filepath.Dir(filename)
-	if !util.FileExists(parentDir) {
-		return nil, fmt.Errorf("user database directory %s does not exist or is not accessible", parentDir)
-	}
-	db, err := sql.Open("sqlite3", filename)
-	if err != nil {
-		return nil, err
-	}
-	if err := setupSQLite(db); err != nil {
-		return nil, err
-	}
-	if err := runSQLiteStartupQueries(db, startupQueries); err != nil {
-		return nil, err
-	}
-	manager := &Manager{
-		config:     config,
-		db:         db,
-		statsQueue: make(map[string]*Stats),
-		tokenQueue: make(map[string]*TokenUpdate),
-		queries: queries{
+var sqliteQueries = queries{
 	selectUserByID:               sqliteSelectUserByIDQuery,
 	selectUserByName:             sqliteSelectUserByNameQuery,
 	selectUserByToken:            sqliteSelectUserByTokenQuery,
@@ -277,10 +256,23 @@ func NewSQLiteManager(filename, startupQueries string, config *Config) (*Manager
 	insertPhoneNumber:            sqliteInsertPhoneNumberQuery,
 	deletePhoneNumber:            sqliteDeletePhoneNumberQuery,
 	updateBilling:                sqliteUpdateBillingQuery,
-		},
 }
-	if err := initManager(manager); err != nil {
+
+// NewSQLiteManager creates a new Manager backed by a SQLite database
+func NewSQLiteManager(filename, startupQueries string, config *Config) (*Manager, error) {
+	parentDir := filepath.Dir(filename)
+	if !util.FileExists(parentDir) {
+		return nil, fmt.Errorf("user database directory %s does not exist or is not accessible", parentDir)
+	}
+	db, err := sql.Open("sqlite3", filename)
+	if err != nil {
 		return nil, err
 	}
-	return manager, nil
+	if err := setupSQLite(db); err != nil {
+		return nil, err
+	}
+	if err := runSQLiteStartupQueries(db, startupQueries); err != nil {
+		return nil, err
+	}
+	return newManager(db, sqliteQueries, config)
 }

user/manager_test.go

@@ -1958,26 +1958,6 @@ func TestStoreTokenRemoveExpired(t *testing.T) {
 	})
 }
 
-func TestStoreTokenCreatePrunesExcess(t *testing.T) {
-	forEachStoreBackend(t, func(t *testing.T, manager *Manager) {
-		require.Nil(t, manager.AddUser("phil", "mypass", RoleUser, false))
-		u, err := manager.User("phil")
-		require.Nil(t, err)
-
-		// Create several tokens
-		var tokenValues []string
-		for i := 0; i < 3; i++ {
-			tk, err := manager.CreateToken(u.ID, "label", time.Now().Add(time.Duration(i+1)*time.Hour), netip.MustParseAddr("1.2.3.4"), false)
-			require.Nil(t, err)
-			tokenValues = append(tokenValues, tk.Value)
-		}
-
-		tokens, err := manager.Tokens(u.ID)
-		require.Nil(t, err)
-		require.True(t, len(tokens) >= 3)
-	})
-}
-
 func TestStoreTokenUpdateLastAccess(t *testing.T) {
 	forEachStoreBackend(t, func(t *testing.T, manager *Manager) {
 		require.Nil(t, manager.AddUser("phil", "mypass", RoleUser, false))