Skip to content
Snippets Groups Projects
Commit ed29b0d1 authored by Travis Ralston's avatar Travis Ralston
Browse files

Pass the breaker error upwards to the caller

Part of #86
parent dd10239f
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,6 @@ func AccessTokenRequiredRoute(next func(r *http.Request, log *logrus.Entry, user ...@@ -19,7 +19,6 @@ func AccessTokenRequiredRoute(next func(r *http.Request, log *logrus.Entry, user
appserviceUserId := util.GetAppserviceUserIdFromRequest(r) appserviceUserId := util.GetAppserviceUserIdFromRequest(r)
userId, err := matrix.GetUserIdFromToken(r.Context(), r.Host, accessToken, appserviceUserId) userId, err := matrix.GetUserIdFromToken(r.Context(), r.Host, accessToken, appserviceUserId)
if err != nil || userId == "" { if err != nil || userId == "" {
log.Error(err)
if err != nil && err != matrix.ErrNoToken { if err != nil && err != matrix.ErrNoToken {
log.Error("Error verifying token: ", err) log.Error("Error verifying token: ", err)
return InternalServerError("Unexpected Error") return InternalServerError("Unexpected Error")
......
...@@ -13,7 +13,7 @@ func IsUserAdmin(ctx context.Context, serverName string, accessToken string) (bo ...@@ -13,7 +13,7 @@ func IsUserAdmin(ctx context.Context, serverName string, accessToken string) (bo
isAdmin := false isAdmin := false
var replyError error var replyError error
cb.CallContext(ctx, func() error { replyError = cb.CallContext(ctx, func() error {
mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken) mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken)
if err != nil { if err != nil {
err, replyError = filterError(err) err, replyError = filterError(err)
...@@ -40,7 +40,7 @@ func ListMedia(ctx context.Context, serverName string, accessToken string, roomI ...@@ -40,7 +40,7 @@ func ListMedia(ctx context.Context, serverName string, accessToken string, roomI
response := &mediaListResponse{} response := &mediaListResponse{}
var replyError error var replyError error
cb.CallContext(ctx, func() error { replyError = cb.CallContext(ctx, func() error {
mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken) mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken)
if err != nil { if err != nil {
err, replyError = filterError(err) err, replyError = filterError(err)
......
...@@ -19,7 +19,7 @@ func GetUserIdFromToken(ctx context.Context, serverName string, accessToken stri ...@@ -19,7 +19,7 @@ func GetUserIdFromToken(ctx context.Context, serverName string, accessToken stri
userId := "" userId := ""
var replyError error var replyError error
cb.CallContext(ctx, func() error { replyError = cb.CallContext(ctx, func() error {
mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken) mtxClient, err := gomatrix.NewClient(hs.ClientServerApi, "", accessToken)
if err != nil { if err != nil {
err, replyError = filterError(err) err, replyError = filterError(err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment