diff --git a/logic/telemetry.go b/logic/telemetry.go index 2e7f569a..8123cb0b 100644 --- a/logic/telemetry.go +++ b/logic/telemetry.go @@ -81,7 +81,8 @@ func sendTelemetry() error { Set("pro_trial_end_date", d.ProTrialEndDate.In(time.UTC).Format("2006-01-02")). Set("admin_email", adminEmail). Set("email", adminEmail). // needed for posthog intgration with hubspot. "admin_email" can only be removed if not used in posthog - Set("is_saas_tenant", d.IsSaasTenant), + Set("is_saas_tenant", d.IsSaasTenant). + Set("domain", d.Domain), }) } @@ -105,6 +106,7 @@ func FetchTelemetryData() telemetryData { data.IsProTrial = true } data.IsSaasTenant = servercfg.DeployedByOperator() + data.Domain = servercfg.GetNmBaseDomain() return data } @@ -202,6 +204,7 @@ type telemetryData struct { IsProTrial bool ProTrialEndDate time.Time IsSaasTenant bool + Domain string } // clientCount - What types of netclients we're tallying diff --git a/pro/controllers/users.go b/pro/controllers/users.go index 272305d2..43fbcc84 100644 --- a/pro/controllers/users.go +++ b/pro/controllers/users.go @@ -210,6 +210,7 @@ func inviteUsers(w http.ResponseWriter, r *http.Request) { return } for _, inviteeEmail := range inviteReq.UserEmails { + inviteeEmail = strings.ToLower(inviteeEmail) // check if user with email exists, then ignore if !email.IsValid(inviteeEmail) { logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("invalid email "+inviteeEmail), "badrequest"))