diff options
author | 2021-03-22 22:26:54 +0100 | |
---|---|---|
committer | 2021-03-22 22:26:54 +0100 | |
commit | aa9ce272dcfa1380b2f05bc3a90ef8ca1b0a7f62 (patch) | |
tree | f3e01f5434a2f90007969373f0fa32dc855207c7 /internal/api | |
parent | fix lint errors (diff) | |
download | gotosocial-aa9ce272dcfa1380b2f05bc3a90ef8ca1b0a7f62.tar.xz |
Oauth/token (#7)
* add host and protocol options
* some fiddling
* tidying up and comments
* tick off /oauth/token
* tidying a bit
* tidying
* go mod tidy
* allow attaching middleware to server
* add middleware
* more user friendly
* add comments
* comments
* store account + app
* tidying
* lots of restructuring
* lint + tidy
Diffstat (limited to 'internal/api')
-rw-r--r-- | internal/api/route_statuses.go | 19 | ||||
-rw-r--r-- | internal/api/server.go | 87 |
2 files changed, 0 insertions, 106 deletions
diff --git a/internal/api/route_statuses.go b/internal/api/route_statuses.go deleted file mode 100644 index fe8aa9699..000000000 --- a/internal/api/route_statuses.go +++ /dev/null @@ -1,19 +0,0 @@ -/* - GoToSocial - Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -package api diff --git a/internal/api/server.go b/internal/api/server.go deleted file mode 100644 index 8e22742bb..000000000 --- a/internal/api/server.go +++ /dev/null @@ -1,87 +0,0 @@ -/* - GoToSocial - Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -package api - -import ( - "fmt" - "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" -) - -type Server interface { - AttachHandler(method string, path string, handler gin.HandlerFunc) - // AttachMiddleware(handler gin.HandlerFunc) - GetAPIGroup() *gin.RouterGroup - Start() - Stop() -} - -type AddsRoutes interface { - AddRoutes(s Server) error -} - -type server struct { - APIGroup *gin.RouterGroup - logger *logrus.Logger - engine *gin.Engine -} - -func (s *server) GetAPIGroup() *gin.RouterGroup { - return s.APIGroup -} - -func (s *server) Start() { - // todo: start gracefully - if err := s.engine.Run(); err != nil { - s.logger.Panicf("server error: %s", err) - } -} - -func (s *server) Stop() { - // todo: shut down gracefully -} - -func (s *server) AttachHandler(method string, path string, handler gin.HandlerFunc) { - if method == "ANY" { - s.engine.Any(path, handler) - } else { - s.engine.Handle(method, path, handler) - } -} - -func New(config *config.Config, logger *logrus.Logger) Server { - engine := gin.New() - store := memstore.NewStore([]byte("authentication-key"), []byte("encryption-keyencryption-key----")) - engine.Use(sessions.Sessions("gotosocial-session", store)) - cwd, _ := os.Getwd() - tmPath := filepath.Join(cwd, fmt.Sprintf("%s*", config.TemplateConfig.BaseDir)) - logger.Debugf("loading templates from %s", tmPath) - engine.LoadHTMLGlob(tmPath) - return &server{ - APIGroup: engine.Group("/api").Group("/v1"), - logger: logger, - engine: engine, - } -} |