plodding away on the accounts endpoint

internal/module/oauth/clientstore.go

@@ -20,7 +20,6 @@ package oauth
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/gotosocial/gotosocial/internal/db"
 	"github.com/gotosocial/oauth2/v4"
@@ -43,7 +42,7 @@ func (cs *clientStore) GetByID(ctx context.Context, clientID string) (oauth2.Cli
 		ID: clientID,
 	}
 	if err := cs.db.GetByID(clientID, poc); err != nil {
-		return nil, fmt.Errorf("database error: %s", err)
+		return nil, err
 	}
 	return models.New(poc.ID, poc.Secret, poc.Domain, poc.UserID), nil
 }

internal/module/oauth/clientstore_test.go

@@ -136,7 +136,7 @@ func (suite *PgClientStoreTestSuite) TestClientSetAndDelete() {
 	// try to get the deleted client; we should get an error
 	deletedClient, err := cs.GetByID(context.Background(), suite.testClientID)
 	suite.Assert().Nil(deletedClient)
-	suite.Assert().NotNil(err)
+	suite.Assert().EqualValues(db.ErrNoEntries{}, err)
 }
 
 func TestPgClientStoreTestSuite(t *testing.T) {

internal/module/oauth/oauth.go

@@ -34,7 +34,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/gotosocial/gotosocial/internal/db"
-	"github.com/gotosocial/gotosocial/internal/gtsmodel"
+	"github.com/gotosocial/gotosocial/internal/db/model"
 	"github.com/gotosocial/gotosocial/internal/module"
 	"github.com/gotosocial/gotosocial/internal/router"
 	"github.com/gotosocial/gotosocial/pkg/mastotypes"
@@ -47,10 +47,10 @@ import (
 )
 
 const (
-	appsPath           = "/api/v1/apps"
-	authSignInPath     = "/auth/sign_in"
-	oauthTokenPath     = "/oauth/token"
-	oauthAuthorizePath = "/oauth/authorize"
+	appsPath              = "/api/v1/apps"
+	authSignInPath        = "/auth/sign_in"
+	oauthTokenPath        = "/oauth/token"
+	oauthAuthorizePath    = "/oauth/authorize"
 	SessionAuthorizedUser = "authorized_user"
 )
 
@@ -179,7 +179,7 @@ func (m *oauthModule) appsPOSTHandler(c *gin.Context) {
 	vapidKey := uuid.NewString()
 
 	// generate the application to put in the database
-	app := &gtsmodel.Application{
+	app := &model.Application{
 		Name:         form.ClientName,
 		Website:      form.Website,
 		RedirectURI:  form.RedirectURIs,
@@ -287,7 +287,7 @@ func (m *oauthModule) authorizeGETHandler(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "no client_id found in session"})
 		return
 	}
-	app := &gtsmodel.Application{
+	app := &model.Application{
 		ClientID: clientID,
 	}
 	if err := m.db.GetWhere("client_id", app.ClientID, app); err != nil {
@@ -296,7 +296,7 @@ func (m *oauthModule) authorizeGETHandler(c *gin.Context) {
 	}
 
 	// we can also use the userid of the user to fetch their username from the db to greet them nicely <3
-	user := &gtsmodel.User{
+	user := &model.User{
 		ID: userID,
 	}
 	if err := m.db.GetByID(user.ID, user); err != nil {
@@ -304,7 +304,7 @@ func (m *oauthModule) authorizeGETHandler(c *gin.Context) {
 		return
 	}
 
-	acct := &gtsmodel.Account{
+	acct := &model.Account{
 		ID: user.AccountID,
 	}
 
@@ -413,7 +413,6 @@ func (m *oauthModule) oauthTokenMiddleware(c *gin.Context) {
 	if ti, err := m.oauthServer.ValidationBearerToken(c.Request); err == nil {
 		l.Tracef("authenticated user %s with bearer token, scope is %s", ti.GetUserID(), ti.GetScope())
 		c.Set(SessionAuthorizedUser, ti.GetUserID())
-
 	} else {
 		l.Trace("continuing with unauthenticated request")
 	}
@@ -437,7 +436,7 @@ func (m *oauthModule) validatePassword(email string, password string) (userid st
 	}
 
 	// first we select the user from the database based on email address, bail if no user found for that email
-	gtsUser := &gtsmodel.User{}
+	gtsUser := &model.User{}
 
 	if err := m.db.GetWhere("email", email, gtsUser); err != nil {
 		l.Debugf("user %s was not retrievable from db during oauth authorization attempt: %s", email, err)

internal/module/oauth/oauth_test.go

@@ -22,12 +22,11 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/gotosocial/gotosocial/internal/config"
 	"github.com/gotosocial/gotosocial/internal/db"
-	"github.com/gotosocial/gotosocial/internal/gtsmodel"
+	"github.com/gotosocial/gotosocial/internal/db/model"
 	"github.com/gotosocial/gotosocial/internal/router"
 	"github.com/gotosocial/oauth2/v4"
 	"github.com/sirupsen/logrus"
@@ -40,9 +39,9 @@ type OauthTestSuite struct {
 	tokenStore      oauth2.TokenStore
 	clientStore     oauth2.ClientStore
 	db              db.DB
-	testAccount     *gtsmodel.Account
-	testApplication *gtsmodel.Application
-	testUser        *gtsmodel.User
+	testAccount     *model.Account
+	testApplication *model.Application
+	testUser        *model.User
 	testClient      *oauthClient
 	config          *config.Config
 }
@@ -76,11 +75,11 @@ func (suite *OauthTestSuite) SetupSuite() {
 
 	acctID := uuid.NewString()
 
-	suite.testAccount = &gtsmodel.Account{
+	suite.testAccount = &model.Account{
 		ID:       acctID,
 		Username: "test_user",
 	}
-	suite.testUser = &gtsmodel.User{
+	suite.testUser = &model.User{
 		EncryptedPassword: string(encryptedPassword),
 		Email:             "user@example.org",
 		AccountID:         acctID,
@@ -90,7 +89,7 @@ func (suite *OauthTestSuite) SetupSuite() {
 		Secret: "some-secret",
 		Domain: fmt.Sprintf("%s://%s", c.Protocol, c.Host),
 	}
-	suite.testApplication = &gtsmodel.Application{
+	suite.testApplication = &model.Application{
 		Name:         "a test application",
 		Website:      "https://some-application-website.com",
 		RedirectURI:  "http://localhost:8080",
@@ -116,9 +115,9 @@ func (suite *OauthTestSuite) SetupTest() {
 	models := []interface{}{
 		&oauthClient{},
 		&oauthToken{},
-		&gtsmodel.User{},
-		&gtsmodel.Account{},
-		&gtsmodel.Application{},
+		&model.User{},
+		&model.Account{},
+		&model.Application{},
 	}
 
 	for _, m := range models {
@@ -150,9 +149,9 @@ func (suite *OauthTestSuite) TearDownTest() {
 	models := []interface{}{
 		&oauthClient{},
 		&oauthToken{},
-		&gtsmodel.User{},
-		&gtsmodel.Account{},
-		&gtsmodel.Application{},
+		&model.User{},
+		&model.Account{},
+		&model.Application{},
 	}
 	for _, m := range models {
 		if err := suite.db.DropTable(m); err != nil {
@@ -179,11 +178,10 @@ func (suite *OauthTestSuite) TestAPIInitialize() {
 		suite.FailNow(fmt.Sprintf("error mapping routes onto router: %s", err))
 	}
 
-	go r.Start()
-	time.Sleep(60 * time.Second)
-	// http://localhost:8080/oauth/authorize?client_id=a-known-client-id&response_type=code&redirect_uri=http://localhost:8080&scope=read
-	// curl -v -F client_id=a-known-client-id -F client_secret=some-secret -F redirect_uri=http://localhost:8080 -F code=[ INSERT CODE HERE ] -F grant_type=authorization_code localhost:8080/oauth/token
-	// curl -v -H "Authorization: Bearer [INSERT TOKEN HERE]" http://localhost:8080
+	r.Start()
+	if err := r.Stop(context.Background()); err != nil {
+		suite.FailNow(fmt.Sprintf("error stopping router: %s", err))
+	}
 }
 
 func TestOauthTestSuite(t *testing.T) {