mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 23:12:25 -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,10 +19,12 @@ | |||
| package account | ||||
| 
 | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"net/http" | ||||
| 
 | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtserror" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||
| ) | ||||
| 
 | ||||
|  | @ -54,33 +56,38 @@ import ( | |||
| //     description: Your relationship to this account. | ||||
| //     schema: | ||||
| //       "$ref": "#/definitions/accountRelationship" | ||||
| //   '401': | ||||
| //      description: unauthorized | ||||
| //   '400': | ||||
| //      description: bad request | ||||
| //   '401': | ||||
| //      description: unauthorized | ||||
| //   '404': | ||||
| //      description: not found | ||||
| //   '406': | ||||
| //      description: not acceptable | ||||
| //   '500': | ||||
| //      description: internal server error | ||||
| func (m *Module) AccountUnblockPOSTHandler(c *gin.Context) { | ||||
| 	authed, err := oauth.Authed(c, true, true, true, true) | ||||
| 	if err != nil { | ||||
| 		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()}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	targetAcctID := c.Param(IDKey) | ||||
| 	if targetAcctID == "" { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": "no account id specified"}) | ||||
| 		err := errors.New("no account id specified") | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	relationship, errWithCode := m.processor.AccountBlockRemove(c.Request.Context(), authed, targetAcctID) | ||||
| 	if errWithCode != nil { | ||||
| 		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