Merge pull request #1745 from mattermost/plt-1118

PLT-1118 Add ability to switch between SSO and email account

2 files changed, 25 insertions, 0 deletions

diff --git a/model/client.go b/model/client.go
index b9b97dedc..f1773f3c7 100644
--- a/model/client.go
+++ b/model/client.go
@@ -349,6 +349,24 @@ func (c *Client) GetSessions(id string) (*Result, *AppError) {
 	}
 }
 
+func (c *Client) SwitchToSSO(m map[string]string) (*Result, *AppError) {
+	if r, err := c.DoApiPost("/users/switch_to_sso", MapToJson(m)); err != nil {
+		return nil, err
+	} else {
+		return &Result{r.Header.Get(HEADER_REQUEST_ID),
+			r.Header.Get(HEADER_ETAG_SERVER), MapFromJson(r.Body)}, nil
+	}
+}
+
+func (c *Client) SwitchToEmail(m map[string]string) (*Result, *AppError) {
+	if r, err := c.DoApiPost("/users/switch_to_email", MapToJson(m)); err != nil {
+		return nil, err
+	} else {
+		return &Result{r.Header.Get(HEADER_REQUEST_ID),
+			r.Header.Get(HEADER_ETAG_SERVER), MapFromJson(r.Body)}, nil
+	}
+}
+
 func (c *Client) Command(channelId string, command string, suggest bool) (*Result, *AppError) {
 	m := make(map[string]string)
 	m["command"] = command
diff --git a/model/oauth.go b/model/oauth.go
index 448fd9dc9..8336e26ba 100644
--- a/model/oauth.go
+++ b/model/oauth.go
@@ -10,6 +10,13 @@ import (
 	"unicode/utf8"
 )
 
+const (
+	OAUTH_ACTION_SIGNUP       = "signup"
+	OAUTH_ACTION_LOGIN        = "login"
+	OAUTH_ACTION_EMAIL_TO_SSO = "email_to_sso"
+	OAUTH_ACTION_SSO_TO_EMAIL = "sso_to_email"
+)
+
 type OAuthApp struct {
 	Id           string      `json:"id"`
 	CreatorId    string      `json:"creator_id"`