summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-08 10:05:12 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-08 10:05:12 -0500
commit8fc42cbeb6fc7c824b175e522b0039ee7167edf1 (patch)
treec1a522dc316bc3d25826a0cd359ee483ebfbab19
parentc18cac1f713acad4b3e1a3c71c76a77326f9f49e (diff)
parente7ece19957f17bf60379167dd9ae9e7bac804e0a (diff)
downloadchat-8fc42cbeb6fc7c824b175e522b0039ee7167edf1.tar.gz
chat-8fc42cbeb6fc7c824b175e522b0039ee7167edf1.tar.bz2
chat-8fc42cbeb6fc7c824b175e522b0039ee7167edf1.zip
Merge pull request #2373 from mattermost/PLT-1988
PLT-1988 fixing slash logout
-rw-r--r--api/command_logout.go3
-rw-r--r--api/command_logout_test.go3
2 files changed, 4 insertions, 2 deletions
diff --git a/api/command_logout.go b/api/command_logout.go
index fb69b4f85..912093162 100644
--- a/api/command_logout.go
+++ b/api/command_logout.go
@@ -33,5 +33,6 @@ func (me *LogoutProvider) GetCommand(c *Context) *model.Command {
}
func (me *LogoutProvider) DoCommand(c *Context, channelId string, message string) *model.CommandResponse {
- return &model.CommandResponse{GotoLocation: "/logout", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command_logout.success_message")}
+
+ return &model.CommandResponse{GotoLocation: c.GetTeamURL() + "/logout", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command_logout.success_message")}
}
diff --git a/api/command_logout_test.go b/api/command_logout_test.go
index 86979316b..eee7520a8 100644
--- a/api/command_logout_test.go
+++ b/api/command_logout_test.go
@@ -4,6 +4,7 @@
package api
import (
+ "strings"
"testing"
"github.com/mattermost/platform/model"
@@ -26,7 +27,7 @@ func TestLogoutTestCommand(t *testing.T) {
channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
rs1 := Client.Must(Client.Command(channel1.Id, "/logout", false)).Data.(*model.CommandResponse)
- if rs1.GotoLocation != "/logout" {
+ if !strings.HasSuffix(rs1.GotoLocation, "logout") {
t.Fatal("failed to logout")
}
}