mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 12:02:26 -05:00 
			
		
		
		
	[feature] More consistent API error handling (#637)
* update templates * start reworking api error handling * update template * return AP status at web endpoint if negotiated * start making api error handling much more consistent * update account endpoints to new error handling * use new api error handling in admin endpoints * go fmt ./... * use api error logic in app * use generic error handling in auth * don't export generic error handler * don't defer clearing session * user nicer error handling on oidc callback handler * tidy up the sign in handler * tidy up the token handler * use nicer error handling in blocksget * auth emojis endpoint * fix up remaining api endpoints * fix whoopsie during login flow * regenerate swagger docs * change http error logging to debug
This commit is contained in:
		
					parent
					
						
							
								91c0ed863a
							
						
					
				
			
			
				commit
				
					
						1ede54ddf6
					
				
			
		
					 130 changed files with 2154 additions and 1673 deletions
				
			
		|  | @ -19,12 +19,13 @@ | |||
| package user | ||||
| 
 | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"net/http" | ||||
| 
 | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/sirupsen/logrus" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/model" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtserror" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||
| ) | ||||
| 
 | ||||
|  | @ -54,48 +55,48 @@ import ( | |||
| // responses: | ||||
| //   '200': | ||||
| //     description: Change successful | ||||
| //   '400': | ||||
| //      description: bad request | ||||
| //   '401': | ||||
| //      description: unauthorized | ||||
| //   '403': | ||||
| //      description: forbidden | ||||
| //   '400': | ||||
| //      description: bad request | ||||
| //   '406': | ||||
| //      description: not acceptable | ||||
| //   '500': | ||||
| //      description: "internal error" | ||||
| //      description: internal error | ||||
| func (m *Module) PasswordChangePOSTHandler(c *gin.Context) { | ||||
| 	l := logrus.WithField("func", "PasswordChangePOSTHandler") | ||||
| 
 | ||||
| 	authed, err := oauth.Authed(c, true, true, true, true) | ||||
| 	if err != nil { | ||||
| 		l.Debugf("error authing: %s", err) | ||||
| 		c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err := api.NegotiateAccept(c, api.JSONAcceptHeaders...); err != nil { | ||||
| 		c.JSON(http.StatusNotAcceptable, gin.H{"error": err.Error()}) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	// First check this user/account is active. | ||||
| 	if authed.User.Disabled || !authed.User.Approved || !authed.Account.SuspendedAt.IsZero() { | ||||
| 		l.Debugf("couldn't auth: %s", err) | ||||
| 		c.JSON(http.StatusForbidden, gin.H{"error": "account is disabled, not yet approved, or suspended"}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	form := &model.PasswordChangeRequest{} | ||||
| 	if err := c.ShouldBind(form); err != nil || form == nil || form.NewPassword == "" || form.OldPassword == "" { | ||||
| 		if err != nil { | ||||
| 			l.Debugf("could not parse form from request: %s", err) | ||||
| 		} | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": "missing one or more required form values"}) | ||||
| 	if err := c.ShouldBind(form); err != nil { | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if form.OldPassword == "" { | ||||
| 		err := errors.New("password change request missing field old_password") | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if form.NewPassword == "" { | ||||
| 		err := errors.New("password change request missing field new_password") | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if errWithCode := m.processor.UserChangePassword(c.Request.Context(), authed, form); errWithCode != nil { | ||||
| 		l.Debugf("error changing user password: %s", errWithCode.Error()) | ||||
| 		c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) | ||||
| 		api.ErrorHandler(c, errWithCode, m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue