diff options
author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-10-10 00:55:47 +0000 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-09 20:55:47 -0400 |
commit | bffcccf99de8a8f3c68cff9e39d2847f0996b67b (patch) | |
tree | 10bf45d87927dc792a233d0653d6ba273c9a7b28 /api4/service_terms.go | |
parent | 59319b7915b8eb4c20a0d4878382cc0e41fc536d (diff) | |
download | chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.gz chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.bz2 chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.zip |
Refactored to rename "service terms" to "terms of service" (#9581)
* #124 renamed identififers from service terms to terms of service
* #124 renamed identififers from service terms to terms of service
* 124 renamed ServiceTerms model to TermsOfService
* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService
* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService
* #124 fixed formatting
* #124 fixed formatting
* #132 renamed table ServiceTerms to TermsOfService
* #124 renamed some missed files from 'service_terms' to 'terms_of_service'
* #124 removed fixed TODOs
* drop migrate of ServiceTerms table, since backporting
* s/ServiceTerms/TermsOfService/ in tests
* s/AcceptedServiceTermsId/AcceptedTermsOfServiceId/
Change the model attribute, even though the column name will eventually be removed.
* s/accepted_service_terms_id/accepted_terms_of_service_id/ to match redux
* s/serviceTerms/termsOfService
* rename column too, and add max size constraint
* s/EnableCustomServiceTerms/EnableCustomTermsOfService
Diffstat (limited to 'api4/service_terms.go')
-rw-r--r-- | api4/service_terms.go | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/api4/service_terms.go b/api4/service_terms.go deleted file mode 100644 index ff953102d..000000000 --- a/api4/service_terms.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package api4 - -import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "net/http" -) - -func (api *API) InitServiceTerms() { - api.BaseRoutes.ServiceTerms.Handle("", api.ApiSessionRequired(getServiceTerms)).Methods("GET") - api.BaseRoutes.ServiceTerms.Handle("", api.ApiSessionRequired(createServiceTerms)).Methods("POST") -} - -func getServiceTerms(c *Context, w http.ResponseWriter, r *http.Request) { - serviceTerms, err := c.App.GetLatestServiceTerms() - if err != nil { - c.Err = err - return - } - - w.Write([]byte(serviceTerms.ToJson())) -} - -func createServiceTerms(c *Context, w http.ResponseWriter, r *http.Request) { - if !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) - return - } - - if license := c.App.License(); license == nil || !*license.Features.CustomTermsOfService { - c.Err = model.NewAppError("createServiceTerms", "api.create_service_terms.custom_service_terms_disabled.app_error", nil, "", http.StatusBadRequest) - return - } - - props := model.MapFromJson(r.Body) - text := props["text"] - userId := c.Session.UserId - - if text == "" { - c.Err = model.NewAppError("Config.IsValid", "api.create_service_terms.empty_text.app_error", nil, "", http.StatusBadRequest) - return - } - - oldServiceTerms, err := c.App.GetLatestServiceTerms() - if err != nil && err.Id != app.ERROR_SERVICE_TERMS_NO_ROWS_FOUND { - c.Err = err - return - } - - if oldServiceTerms == nil || oldServiceTerms.Text != text { - serviceTerms, err := c.App.CreateServiceTerms(text, userId) - if err != nil { - c.Err = err - return - } - - w.Write([]byte(serviceTerms.ToJson())) - } else { - w.Write([]byte(oldServiceTerms.ToJson())) - } -} |