summaryrefslogtreecommitdiffstats
path: root/app/session.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2018-04-20 08:44:01 -0400
committerGitHub <noreply@github.com>2018-04-20 08:44:01 -0400
commit7987c95fcd7f7a9e6d4d174be403bf170f7b9115 (patch)
treea5bcb4d93debddf7293adff056d2bd5a4d76a724 /app/session.go
parent514033f14c16f0634ffb36584b866c153943a692 (diff)
downloadchat-7987c95fcd7f7a9e6d4d174be403bf170f7b9115.tar.gz
chat-7987c95fcd7f7a9e6d4d174be403bf170f7b9115.tar.bz2
chat-7987c95fcd7f7a9e6d4d174be403bf170f7b9115.zip
MM-10133 Suppress confusing personal access token message in invalid session error (#8645)
* Suppress confusing personal access token message in invalid session error * Updates per feedback
Diffstat (limited to 'app/session.go')
-rw-r--r--app/session.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/session.go b/app/session.go
index 43fbf7979..03754398d 100644
--- a/app/session.go
+++ b/app/session.go
@@ -63,7 +63,13 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) {
var err *model.AppError
session, err = a.createSessionForUserAccessToken(token)
if err != nil {
- return nil, model.NewAppError("GetSession", "api.context.invalid_token.error", map[string]interface{}{"Token": token}, err.Error(), http.StatusUnauthorized)
+ detailedError := ""
+ statusCode := http.StatusUnauthorized
+ if err.Id != "app.user_access_token.invalid_or_missing" {
+ detailedError = err.Error()
+ statusCode = err.StatusCode
+ }
+ return nil, model.NewAppError("GetSession", "api.context.invalid_token.error", map[string]interface{}{"Token": token}, detailedError, statusCode)
}
}