From 7987c95fcd7f7a9e6d4d174be403bf170f7b9115 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Fri, 20 Apr 2018 08:44:01 -0400
Subject: [PATCH] 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
---
 app/session.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/session.go b/app/session.go
index 43fbf79793..03754398df 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)
 		}
 	}