Api/v1/accounts (#8)

* start work on accounts module

* plodding away on the accounts endpoint

* groundwork for other account routes

* add password validator

* validation utils

* require account approval flags

* comments

* comments

* go fmt

* comments

* add distributor stub

* rename api to federator

* tidy a bit

* validate new account requests

* rename r router

* comments

* add domain blocks

* add some more shortcuts

* add some more shortcuts

* check email + username availability

* email block checking for signups

* chunking away at it

* tick off a few more things

* some fiddling with tests

* add mock package

* relocate repo

* move mocks around

* set app id on new signups

* initialize oauth server properly

* rename oauth server

* proper mocking tests

* go fmt ./...

* add required fields

* change name of func

* move validation to account.go

* more tests!

* add some file utility tools

* add mediaconfig

* new shortcut

* add some more fields

* add followrequest model

* add notify

* update mastotypes

* mock out storage interface

* start building media interface

* start on update credentials

* mess about with media a bit more

* test image manipulation

* media more or less working

* account update nearly working

* rearranging my package ;) ;) ;)

* phew big stuff!!!!

* fix type checking

* *fiddles*

* Add CreateTables func

* account registration flow working

* tidy

* script to step through auth flow

* add a lil helper for generating user uris

* fiddling with federation a bit

* update progress

* Tidying and linting

internal/router/mock_Router.go

@@ -0,0 +1,44 @@
+// Code generated by mockery v2.7.4. DO NOT EDIT.
+
+package router
+
+import (
+	context "context"
+
+	gin "github.com/gin-gonic/gin"
+	mock "github.com/stretchr/testify/mock"
+)
+
+// MockRouter is an autogenerated mock type for the Router type
+type MockRouter struct {
+	mock.Mock
+}
+
+// AttachHandler provides a mock function with given fields: method, path, f
+func (_m *MockRouter) AttachHandler(method string, path string, f gin.HandlerFunc) {
+	_m.Called(method, path, f)
+}
+
+// AttachMiddleware provides a mock function with given fields: handler
+func (_m *MockRouter) AttachMiddleware(handler gin.HandlerFunc) {
+	_m.Called(handler)
+}
+
+// Start provides a mock function with given fields:
+func (_m *MockRouter) Start() {
+	_m.Called()
+}
+
+// Stop provides a mock function with given fields: ctx
+func (_m *MockRouter) Stop(ctx context.Context) error {
+	ret := _m.Called(ctx)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}

internal/router/router.go

@@ -19,62 +19,66 @@
 package router
 
 import (
+	"context"
 	"crypto/rand"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/memstore"
 	"github.com/gin-gonic/gin"
-	"github.com/gotosocial/gotosocial/internal/config"
 	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
 // Router provides the REST interface for gotosocial, using gin.
 type Router interface {
 	// Attach a gin handler to the router with the given method and path
-	AttachHandler(method string, path string, handler gin.HandlerFunc)
+	AttachHandler(method string, path string, f gin.HandlerFunc)
 	// Attach a gin middleware to the router that will be used globally
 	AttachMiddleware(handler gin.HandlerFunc)
 	// Start the router
 	Start()
 	// Stop the router
-	Stop()
+	Stop(ctx context.Context) error
 }
 
 // router fulfils the Router interface using gin and logrus
 type router struct {
 	logger *logrus.Logger
 	engine *gin.Engine
+	srv    *http.Server
 }
 
 // Start starts the router nicely
-func (s *router) Start() {
-	// todo: start gracefully
-	if err := s.engine.Run(); err != nil {
-		s.logger.Panicf("server error: %s", err)
-	}
+func (r *router) Start() {
+	go func() {
+		if err := r.srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			r.logger.Fatalf("listen: %s", err)
+		}
+	}()
 }
 
 // Stop shuts down the router nicely
-func (s *router) Stop() {
-	// todo: shut down gracefully
+func (r *router) Stop(ctx context.Context) error {
+	return r.srv.Shutdown(ctx)
 }
 
 // AttachHandler attaches the given gin.HandlerFunc to the router with the specified method and path.
 // If the path is set to ANY, then the handlerfunc will be used for ALL methods at its given path.
-func (s *router) AttachHandler(method string, path string, handler gin.HandlerFunc) {
+func (r *router) AttachHandler(method string, path string, handler gin.HandlerFunc) {
 	if method == "ANY" {
-		s.engine.Any(path, handler)
+		r.engine.Any(path, handler)
 	} else {
-		s.engine.Handle(method, path, handler)
+		r.engine.Handle(method, path, handler)
 	}
 }
 
 // AttachMiddleware attaches a gin middleware to the router that will be used globally
-func (s *router) AttachMiddleware(middleware gin.HandlerFunc) {
-	s.engine.Use(middleware)
+func (r *router) AttachMiddleware(middleware gin.HandlerFunc) {
+	r.engine.Use(middleware)
 }
 
 // New returns a new Router with the specified configuration, using the given logrus logger.
@@ -100,6 +104,10 @@ func New(config *config.Config, logger *logrus.Logger) (Router, error) {
 	return &router{
 		logger: logger,
 		engine: engine,
+		srv: &http.Server{
+			Addr:    ":8080",
+			Handler: engine,
+		},
 	}, nil
 }