diff options
author | 2021-12-11 17:50:00 +0100 | |
---|---|---|
committer | 2021-12-11 17:50:00 +0100 | |
commit | e2daf0f012a21928ceeba03e5754b5a2233f4016 (patch) | |
tree | e94cac357b3a2cc63db9adcb730ce3053bf0b970 /internal/api/client/auth/authorize.go | |
parent | Implement Cobra CLI tooling, Viper config tooling (#336) (diff) | |
download | gotosocial-e2daf0f012a21928ceeba03e5754b5a2233f4016.tar.xz |
Add `Accept` header negotiation to relevant API endpoints (#337)
* start centralizing negotiation logic for API
* swagger document nodeinfo endpoint
* go fmt
* document negotiate function
* use content negotiation
* tidy up negotiation logic
* negotiate content throughout client api
* swagger
* remove attachment on Content
* add accept header to test requests
Diffstat (limited to 'internal/api/client/auth/authorize.go')
-rw-r--r-- | internal/api/client/auth/authorize.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/internal/api/client/auth/authorize.go b/internal/api/client/auth/authorize.go index 6382f473d..35a681114 100644 --- a/internal/api/client/auth/authorize.go +++ b/internal/api/client/auth/authorize.go @@ -21,14 +21,16 @@ package auth import ( "errors" "fmt" - "github.com/sirupsen/logrus" "net/http" "net/url" "strings" + "github.com/sirupsen/logrus" + "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -41,6 +43,11 @@ func (m *Module) AuthorizeGETHandler(c *gin.Context) { l := logrus.WithField("func", "AuthorizeGETHandler") s := sessions.Default(c) + if _, err := api.NegotiateAccept(c, api.HTMLAcceptHeaders...); err != nil { + c.JSON(http.StatusNotAcceptable, gin.H{"error": err.Error()}) + return + } + // UserID will be set in the session by AuthorizePOSTHandler if the caller has already gone through the authentication flow // If it's not set, then we don't know yet who the user is, so we need to redirect them to the sign in page. userID, ok := s.Get(sessionUserID).(string) |