mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-31 19:32:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reference global logrus (#274)

Browse source 
* reference logrus' global logger instead of passing and storing a logger reference everywhere

* always directly use global logrus logger instead of referencing an instance

* test suites should also directly use the global logrus logger

* rename gin logging function to clarify that it's middleware

* correct comments which erroneously referenced removed logger parameter

* setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible
This commit is contained in:
R. Aidan Campbell 2021-10-11 05:37:33 -07:00 • committed by GitHub
commit 083099a957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
210 changed files with 506 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/api/client/auth/signin.go
View file

@ -21,6 +21,7 @@ package auth
import (
"context"
"errors"
"github.com/sirupsen/logrus"
"net/http"
"github.com/gin-contrib/sessions"
@ -40,7 +41,7 @@ type login struct {
// The idea is to present a sign in page to the user, where they can enter their username and password.
// The form will then POST to the sign in page, which will be handled by SignInPOSTHandler
func (m *Module) SignInGETHandler(c *gin.Context) {
l := m.log.WithField("func", "SignInGETHandler")
l := logrus.WithField("func", "SignInGETHandler")
l.Trace("entering sign in handler")
if m.idp != nil {
s := sessions.Default(c)
@ -65,7 +66,7 @@ func (m *Module) SignInGETHandler(c *gin.Context) {
// The idea is to present a sign in page to the user, where they can enter their username and password.
// The handler will then redirect to the auth handler served at /auth
func (m *Module) SignInPOSTHandler(c *gin.Context) {
l := m.log.WithField("func", "SignInPOSTHandler")
l := logrus.WithField("func", "SignInPOSTHandler")
s := sessions.Default(c)
form := &login{}
if err := c.ShouldBind(form); err != nil {
@ -98,7 +99,7 @@ func (m *Module) SignInPOSTHandler(c *gin.Context) {
// address stored in the database. If OK, we return the userid (a ulid) for that user,
// so that it can be used in further Oauth flows to generate a token/retreieve an oauth client from the db.
func (m *Module) ValidatePassword(ctx context.Context, email string, password string) (userid string, err error) {
l := m.log.WithField("func", "ValidatePassword")
l := logrus.WithField("func", "ValidatePassword")
// make sure an email/password was provided and bail if not
if email == "" || password == "" {