Remove deprecated *model.Client methods (#18042)
```release-note Removed CheckUserMfa Removed GetServerBusyExpires ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
249a0b9870
Коммит
2488b980e8
@@ -676,24 +676,6 @@ func TestGetServerBusy(t *testing.T) {
|
||||
}, "as system admin")
|
||||
}
|
||||
|
||||
func TestGetServerBusyExpires(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
|
||||
th.App.Srv().Busy.Set(time.Second * 30)
|
||||
|
||||
t.Run("as system user", func(t *testing.T) {
|
||||
_, resp := th.Client.GetServerBusyExpires()
|
||||
CheckForbiddenStatus(t, resp)
|
||||
})
|
||||
|
||||
th.TestForSystemAdminAndLocal(t, func(t *testing.T, c *model.Client4) {
|
||||
expires, resp := c.GetServerBusyExpires()
|
||||
CheckNoError(t, resp)
|
||||
require.Greater(t, expires.Unix(), time.Now().Unix())
|
||||
}, "as system admin")
|
||||
}
|
||||
|
||||
func TestServerBusy503(t *testing.T) {
|
||||
th := Setup(t)
|
||||
defer th.TearDown()
|
||||
|
||||
@@ -2689,55 +2689,6 @@ func TestUpdateUserMfa(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
// CheckUserMfa is deprecated and should not be used anymore, it will be disabled by default in version 6.0
|
||||
func TestCheckUserMfa(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
th.App.UpdateConfig(func(c *model.Config) {
|
||||
*c.ServiceSettings.DisableLegacyMFA = false
|
||||
})
|
||||
|
||||
required, resp := th.Client.CheckUserMfa(th.BasicUser.Email)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
require.False(t, required, "mfa not active")
|
||||
|
||||
_, resp = th.Client.CheckUserMfa("")
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
th.Client.Logout()
|
||||
|
||||
required, resp = th.Client.CheckUserMfa(th.BasicUser.Email)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
require.False(t, required, "mfa not active")
|
||||
|
||||
th.App.Srv().SetLicense(model.NewTestLicense("mfa"))
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableMultifactorAuthentication = true })
|
||||
|
||||
th.LoginBasic()
|
||||
|
||||
required, resp = th.Client.CheckUserMfa(th.BasicUser.Email)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
require.False(t, required, "mfa not active")
|
||||
|
||||
th.Client.Logout()
|
||||
|
||||
required, resp = th.Client.CheckUserMfa(th.BasicUser.Email)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
require.False(t, required, "mfa not active")
|
||||
|
||||
th.App.UpdateConfig(func(c *model.Config) {
|
||||
*c.ServiceSettings.DisableLegacyMFA = true
|
||||
})
|
||||
|
||||
_, resp = th.Client.CheckUserMfa(th.BasicUser.Email)
|
||||
CheckNotFoundStatus(t, resp)
|
||||
}
|
||||
|
||||
func TestUserLoginMFAFlow(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
Ссылка в новой задаче
Block a user