summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-25 11:20:19 -0400
committerCorey Hulen <corey@hulen.com>2015-06-25 11:20:19 -0400
commit049a41f9beb3b55a4eb84d4730011b257aaf26b3 (patch)
tree7ea9f7eeaa753d8ceac1f955b6b9af061fe4d751 /model
parentbfe8d13cd15d7e4ba7da76d3b202109d2a4b7847 (diff)
parent40b9fc5e398f8212feca10459b654230af872298 (diff)
downloadchat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.tar.gz
chat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.tar.bz2
chat-049a41f9beb3b55a4eb84d4730011b257aaf26b3.zip
Merge pull request #27 from mattermost/mm-1240
fixes mm-1240 adds ability to turn valet feature on
Diffstat (limited to 'model')
-rw-r--r--model/client.go18
-rw-r--r--model/team.go1
2 files changed, 19 insertions, 0 deletions
diff --git a/model/client.go b/model/client.go
index 0448828bb..ab01e7d62 100644
--- a/model/client.go
+++ b/model/client.go
@@ -186,6 +186,15 @@ func (c *Client) UpdateTeamName(data map[string]string) (*Result, *AppError) {
}
}
+func (c *Client) UpdateValetFeature(data map[string]string) (*Result, *AppError) {
+ if r, err := c.DoPost("/teams/update_valet_feature", MapToJson(data)); 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) CreateUser(user *User, hash string) (*Result, *AppError) {
if r, err := c.DoPost("/users/create", user.ToJson()); err != nil {
return nil, err
@@ -647,6 +656,15 @@ func (c *Client) GetStatuses() (*Result, *AppError) {
}
}
+func (c *Client) GetMyTeam(etag string) (*Result, *AppError) {
+ if r, err := c.DoGet("/teams/me", "", etag); err != nil {
+ return nil, err
+ } else {
+ return &Result{r.Header.Get(HEADER_REQUEST_ID),
+ r.Header.Get(HEADER_ETAG_SERVER), TeamFromJson(r.Body)}, nil
+ }
+}
+
func (c *Client) MockSession(sessionToken string) {
c.AuthToken = sessionToken
}
diff --git a/model/team.go b/model/team.go
index a510cde78..5c66f3b1f 100644
--- a/model/team.go
+++ b/model/team.go
@@ -24,6 +24,7 @@ type Team struct {
Type string `json:"type"`
CompanyName string `json:"company_name"`
AllowedDomains string `json:"allowed_domains"`
+ AllowValet bool `json:"allow_valet"`
}
type Invites struct {