diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-06 17:25:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 17:25:49 -0600 |
| commit | 1ec295f88ca99e9423ffd91019cecf802ae3dc77 (patch) | |
| tree | 05abc364fefdc6b1088bfb4a307ba11db0dc427f /api4/context.go | |
| parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
| download | chat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.tar.gz chat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.tar.bz2 chat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.zip | |
add App.License, remove utils.IsLicensed / utils.License calls (#8203)
Diffstat (limited to 'api4/context.go')
| -rw-r--r-- | api4/context.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/context.go b/api4/context.go index 980897062..82c8d9e6c 100644 --- a/api4/context.go +++ b/api4/context.go @@ -112,7 +112,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { c.SetSiteURLHeader(app.GetProtocol(r) + "://" + r.Host) w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId) - w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, c.App.ClientConfigHash(), utils.IsLicensed())) + w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, c.App.ClientConfigHash(), c.App.License() != nil)) w.Header().Set("Content-Type", "application/json") @@ -249,7 +249,7 @@ func (c *Context) SessionRequired() { func (c *Context) MfaRequired() { // Must be licensed for MFA and have it configured for enforcement - if !utils.IsLicensed() || !*utils.License().Features.MFA || !*c.App.Config().ServiceSettings.EnableMultifactorAuthentication || !*c.App.Config().ServiceSettings.EnforceMultifactorAuthentication { + if license := c.App.License(); license == nil || !*license.Features.MFA || !*c.App.Config().ServiceSettings.EnableMultifactorAuthentication || !*c.App.Config().ServiceSettings.EnforceMultifactorAuthentication { return } |