summaryrefslogtreecommitdiff
path: root/internal/processing/streaming/authorize.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-06-08 20:38:03 +0200
committerLibravatar GitHub <noreply@github.com>2022-06-08 20:38:03 +0200
commit1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643 (patch)
tree727436fb9bf9da25e30c5ded65c5b5ccaffe0cf0 /internal/processing/streaming/authorize.go
parent[bugfix] #621: add weak type handing to mapstructure decode (#625) (diff)
downloadgotosocial-1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643.tar.xz
[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
Diffstat (limited to 'internal/processing/streaming/authorize.go')
-rw-r--r--internal/processing/streaming/authorize.go27
1 files changed, 19 insertions, 8 deletions
diff --git a/internal/processing/streaming/authorize.go b/internal/processing/streaming/authorize.go
index 9f014e723..70e4741e1 100644
--- a/internal/processing/streaming/authorize.go
+++ b/internal/processing/streaming/authorize.go
@@ -22,29 +22,40 @@ import (
"context"
"fmt"
+ "github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
-func (p *processor) AuthorizeStreamingRequest(ctx context.Context, accessToken string) (*gtsmodel.Account, error) {
+func (p *processor) AuthorizeStreamingRequest(ctx context.Context, accessToken string) (*gtsmodel.Account, gtserror.WithCode) {
ti, err := p.oauthServer.LoadAccessToken(ctx, accessToken)
if err != nil {
- return nil, fmt.Errorf("AuthorizeStreamingRequest: error loading access token: %s", err)
+ err := fmt.Errorf("could not load access token: %s", err)
+ return nil, gtserror.NewErrorUnauthorized(err)
}
uid := ti.GetUserID()
if uid == "" {
- return nil, fmt.Errorf("AuthorizeStreamingRequest: no userid in token")
+ err := fmt.Errorf("no userid in token")
+ return nil, gtserror.NewErrorUnauthorized(err)
}
- // fetch user's and account for this user id
user := &gtsmodel.User{}
- if err := p.db.GetByID(ctx, uid, user); err != nil || user == nil {
- return nil, fmt.Errorf("AuthorizeStreamingRequest: no user found for validated uid %s", uid)
+ if err := p.db.GetByID(ctx, uid, user); err != nil {
+ if err == db.ErrNoEntries {
+ err := fmt.Errorf("no user found for validated uid %s", uid)
+ return nil, gtserror.NewErrorUnauthorized(err)
+ }
+ return nil, gtserror.NewErrorInternalError(err)
}
acct, err := p.db.GetAccountByID(ctx, user.AccountID)
- if err != nil || acct == nil {
- return nil, fmt.Errorf("AuthorizeStreamingRequest: no account retrieved for user with id %s", uid)
+ if err != nil {
+ if err == db.ErrNoEntries {
+ err := fmt.Errorf("no account found for validated uid %s", uid)
+ return nil, gtserror.NewErrorUnauthorized(err)
+ }
+ return nil, gtserror.NewErrorInternalError(err)
}
return acct, nil