소스 검색

Merge branch 'develop' of https://github.com/gravitl/netmaker into develop

abhishek9686 3 달 전
부모
커밋
b41e1a873c
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      logic/telemetry.go
  2. 1 0
      pro/controllers/users.go

+ 4 - 1
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

+ 1 - 0
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"))