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/user.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/user.go')
-rw-r--r-- | api4/user.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/api4/user.go b/api4/user.go index 404457285..c97e90e89 100644 --- a/api4/user.go +++ b/api4/user.go @@ -41,7 +41,7 @@ func (api *API) InitUser() { api.BaseRoutes.Users.Handle("/password/reset/send", api.ApiHandler(sendPasswordReset)).Methods("POST") api.BaseRoutes.Users.Handle("/email/verify", api.ApiHandler(verifyUserEmail)).Methods("POST") api.BaseRoutes.Users.Handle("/email/verify/send", api.ApiHandler(sendVerificationEmail)).Methods("POST") - api.BaseRoutes.User.Handle("/terms_of_service", api.ApiSessionRequired(registerServiceTermsAction)).Methods("POST") + api.BaseRoutes.User.Handle("/terms_of_service", api.ApiSessionRequired(registerTermsOfServiceAction)).Methods("POST") api.BaseRoutes.User.Handle("/auth", api.ApiSessionRequiredTrustRequester(updateUserAuth)).Methods("PUT") @@ -1615,23 +1615,23 @@ func enableUserAccessToken(c *Context, w http.ResponseWriter, r *http.Request) { ReturnStatusOK(w) } -func registerServiceTermsAction(c *Context, w http.ResponseWriter, r *http.Request) { +func registerTermsOfServiceAction(c *Context, w http.ResponseWriter, r *http.Request) { props := model.StringInterfaceFromJson(r.Body) userId := c.Session.UserId - serviceTermsId := props["serviceTermsId"].(string) + termsOfServiceId := props["termsOfServiceId"].(string) accepted := props["accepted"].(bool) - if _, err := c.App.GetServiceTerms(serviceTermsId); err != nil { + if _, err := c.App.GetTermsOfService(termsOfServiceId); err != nil { c.Err = err return } - if err := c.App.RecordUserServiceTermsAction(userId, serviceTermsId, accepted); err != nil { + if err := c.App.RecordUserTermsOfServiceAction(userId, termsOfServiceId, accepted); err != nil { c.Err = err return } - c.LogAudit("ServiceTermsId=" + serviceTermsId + ", accepted=" + strconv.FormatBool(accepted)) + c.LogAudit("TermsOfServiceId=" + termsOfServiceId + ", accepted=" + strconv.FormatBool(accepted)) ReturnStatusOK(w) } |