diff options
author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-09-26 20:49:22 +0000 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-09-26 16:49:22 -0400 |
commit | af275fe9242303581192258ef4f6457fa45a58e4 (patch) | |
tree | df05afdb0894d577574cbee5d056ffddeec3a93e /model/client4.go | |
parent | 4e59a27293394b6d5529efd13ad711daebbc0eb3 (diff) | |
download | chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.gz chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.bz2 chat-af275fe9242303581192258ef4f6457fa45a58e4.zip |
#MM-12130 changes for custom service terms (#9450)
* #MM-12130 changes for custom service terms
* Fixed styling
* Added getServiceTerms API
* removed unnecessary panic
* removed custom service terms text from flat config
* reverted user sql store as those changes are no longer needed
* added tests
* Updated a config key to be more standard
* Added copyright info
* Loading service terms only if the feature is enabled
* Loading service terms only if the feature is enabled
* removed unused index
* added createservice termns API
* made a param to bool instead of string
* added createservice termns API
* review fixes
* fixed styling
* Minor refactoring
* removed saveConfig and loadConfig magic
* added empty service terms text check to createServiceTerms API
* refactoed some urls to be terms_of_service instead of service_terms
* removed check for support settings
* changed URLs in tests
* removed unused code
* fixed a bug
* added service termd id in conif
* fixed a test
* review fixes
* minor fixes
* Fixed TestCreateServiceTerms
Diffstat (limited to 'model/client4.go')
-rw-r--r-- | model/client4.go | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/model/client4.go b/model/client4.go index d9034385b..117f6c570 100644 --- a/model/client4.go +++ b/model/client4.go @@ -401,6 +401,14 @@ func (c *Client4) GetRedirectLocationRoute() string { return fmt.Sprintf("/redirect_location") } +func (c *Client4) GetRegisterServiceTermsRoute(userId string) string { + return c.GetUserRoute(userId) + "/terms_of_service" +} + +func (c *Client4) GetServiceTermsRoute() string { + return "/terms_of_service" +} + func (c *Client4) DoApiGet(url string, etag string) (*http.Response, *AppError) { return c.DoApiRequest(http.MethodGet, c.ApiUrl+url, "", etag) } @@ -3794,3 +3802,38 @@ func (c *Client4) GetRedirectLocation(urlParam, etag string) (string, *Response) return MapFromJson(r.Body)["location"], BuildResponse(r) } } + +func (c *Client4) RegisterServiceTermsAction(userId, serviceTermsId string, accepted bool) (*bool, *Response) { + url := c.GetRegisterServiceTermsRoute(userId) + data := map[string]interface{}{"serviceTermsId": serviceTermsId, "accepted": accepted} + + if r, err := c.DoApiPost(url, StringInterfaceToJson(data)); err != nil { + return nil, BuildErrorResponse(r, err) + } else { + defer closeBody(r) + return NewBool(CheckStatusOK(r)), BuildResponse(r) + } +} + +func (c *Client4) GetServiceTerms(etag string) (*ServiceTerms, *Response) { + url := c.GetServiceTermsRoute() + + if r, err := c.DoApiGet(url, etag); err != nil { + return nil, BuildErrorResponse(r, err) + } else { + defer closeBody(r) + return ServiceTermsFromJson(r.Body), BuildResponse(r) + } +} + +func (c *Client4) CreateServiceTerms(text, userId string) (*ServiceTerms, *Response) { + url := c.GetServiceTermsRoute() + + data := map[string]string{"text": text} + if r, err := c.DoApiPost(url, MapToJson(data)); err != nil { + return nil, BuildErrorResponse(r, err) + } else { + defer closeBody(r) + return ServiceTermsFromJson(r.Body), BuildResponse(r) + } +} |