[MM-29731] Fix panic in saveUserTermsOfService (#16044)
* Fix panic in saveUserTermsOfService * Remove unneeded initialization
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
91bb7d3b11
Коммит
e5e2dbdf1a
12
api4/user.go
12
api4/user.go
@@ -2423,8 +2423,16 @@ func saveUserTermsOfService(c *Context, w http.ResponseWriter, r *http.Request)
|
|||||||
props := model.StringInterfaceFromJson(r.Body)
|
props := model.StringInterfaceFromJson(r.Body)
|
||||||
|
|
||||||
userId := c.App.Session().UserId
|
userId := c.App.Session().UserId
|
||||||
termsOfServiceId := props["termsOfServiceId"].(string)
|
termsOfServiceId, ok := props["termsOfServiceId"].(string)
|
||||||
accepted := props["accepted"].(bool)
|
if !ok {
|
||||||
|
c.SetInvalidParam("termsOfServiceId")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
accepted, ok := props["accepted"].(bool)
|
||||||
|
if !ok {
|
||||||
|
c.SetInvalidParam("accepted")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
auditRec := c.MakeAuditRecord("saveUserTermsOfService", audit.Fail)
|
auditRec := c.MakeAuditRecord("saveUserTermsOfService", audit.Fail)
|
||||||
defer c.LogAuditRec(auditRec)
|
defer c.LogAuditRec(auditRec)
|
||||||
|
|||||||
@@ -828,6 +828,17 @@ func TestGetUserByUsernameWithAcceptedTermsOfService(t *testing.T) {
|
|||||||
require.Equal(t, tos.Id, ruser.TermsOfServiceId, "Terms of service ID should match")
|
require.Equal(t, tos.Id, ruser.TermsOfServiceId, "Terms of service ID should match")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSaveUserTermsOfService(t *testing.T) {
|
||||||
|
th := Setup(t)
|
||||||
|
defer th.TearDown()
|
||||||
|
|
||||||
|
t.Run("Invalid data", func(t *testing.T) {
|
||||||
|
resp, err := th.Client.DoApiPost("/users/"+th.BasicUser.Id+"/terms_of_service", "{}")
|
||||||
|
require.NotNil(t, err)
|
||||||
|
assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func TestGetUserByEmail(t *testing.T) {
|
func TestGetUserByEmail(t *testing.T) {
|
||||||
th := Setup(t)
|
th := Setup(t)
|
||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user