wowee some serious moving stuff around

internal/api/client/auth/auth.go

@@ -24,7 +24,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/api"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
-	"github.com/superseriousbusiness/gotosocial/internal/message"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 	"github.com/superseriousbusiness/gotosocial/internal/router"
 )
 
@@ -39,17 +40,19 @@ const (
 
 // Module implements the ClientAPIModule interface for
 type Module struct {
-	config    *config.Config
-	processor message.Processor
-	log       *logrus.Logger
+	config *config.Config
+	db     db.DB
+	server oauth.Server
+	log    *logrus.Logger
 }
 
 // New returns a new auth module
-func New(config *config.Config, processor message.Processor, log *logrus.Logger) api.ClientModule {
+func New(config *config.Config, db db.DB, server oauth.Server, log *logrus.Logger) api.ClientModule {
 	return &Module{
-		config:    config,
-		processor: processor,
-		log:       log,
+		config: config,
+		db:     db,
+		server: server,
+		log:    log,
 	}
 }
 

internal/api/client/auth/middleware.go

@@ -30,7 +30,7 @@ import (
 // If user or account can't be found, then the handler won't *fail*, in case the server wants to allow
 // public requests that don't have a Bearer token set (eg., for public instance information and so on).
 func (m *Module) OauthTokenMiddleware(c *gin.Context) {
-	l := m.log.WithField("func", "ValidatePassword")
+	l := m.log.WithField("func", "OauthTokenMiddleware")
 	l.Trace("entering OauthTokenMiddleware")
 
 	ti, err := m.server.ValidationBearerToken(c.Request)