diff --git a/api4/license.go b/api4/license.go index 449df3a70a..e39ef3051b 100644 --- a/api4/license.go +++ b/api4/license.go @@ -368,16 +368,17 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) { } // Authentication Features - mfaUsed := c.App.Config().ServiceSettings.EnforceMultifactorAuthentication - ldapUsed := c.App.Config().LdapSettings.Enable - samlUsed := c.App.Config().SamlSettings.Enable - openIdUsed := c.App.Config().OpenIdSettings.Enable - guessAccessAllowed := c.App.Config().GuestAccountsSettings.Enable + config := c.App.Config() + mfaUsed := config.ServiceSettings.EnforceMultifactorAuthentication + ldapUsed := config.LdapSettings.Enable + samlUsed := config.SamlSettings.Enable + openIdUsed := config.OpenIdSettings.Enable + guessAccessAllowed := config.GuestAccountsSettings.Enable authFeatures := map[string]*bool{ model.TrueUpReviewAuthFeaturesMfa: mfaUsed, - model.TueUpReviewAuthFeaturesAdLdap: ldapUsed, - model.TrueUpReviewauthFeaturesSaml: samlUsed, + model.TrueUpReviewAuthFeaturesADLdap: ldapUsed, + model.TrueUpReviewAuthFeaturesSaml: samlUsed, model.TrueUpReviewAuthFeatureOpenId: openIdUsed, model.TrueUpReviewAuthFeatureGuestAccess: guessAccessAllowed, } diff --git a/model/license.go b/model/license.go index ef7d2e4ffd..b0cb95c809 100644 --- a/model/license.go +++ b/model/license.go @@ -40,10 +40,10 @@ var ( ) const ( - TrueUpReviewTelemetryName = "true-up-review-sent" + TrueUpReviewTelemetryName = "true_up_review_sent" TrueUpReviewAuthFeaturesMfa = "multi_factor_authentication" - TueUpReviewAuthFeaturesAdLdap = "ad_ldap_sign_in" - TrueUpReviewauthFeaturesSaml = "saml_sign_in" + TrueUpReviewAuthFeaturesADLdap = "ad_ldap_sign_in" + TrueUpReviewAuthFeaturesSaml = "saml_sign_in" TrueUpReviewAuthFeatureOpenId = "openid_connect" TrueUpReviewAuthFeatureGuestAccess = "guest_access" ) diff --git a/model/true_up_review_profile.go b/model/true_up_review_profile.go index 91e8038f85..54cfb3f9af 100644 --- a/model/true_up_review_profile.go +++ b/model/true_up_review_profile.go @@ -7,7 +7,7 @@ type TrueUpReviewProfile struct { ServerId string `json:"server_id"` ServerVersion string `json:"server_version"` ServerInstallationType string `json:"server_installation_type"` - LicenseId string `json:"licnes_id"` + LicenseId string `json:"license_id"` LicensedSeats int `json:"licensed_seats"` LicensePlan string `json:"license_plan"` CustomerName string `json:"customer_name"` diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index d0e8f91a19..ec88b868c0 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -82,8 +82,6 @@ const ( TrackLicense = "license" TrackServer = "server" TrackPlugins = "plugins" - - TrackTrueUpReview = "true_up_review" ) type ServerIface interface {