login method telemetry

hugodutka · hugodutka · commit 5fdd49153dd8 · 2025-02-22T17:25:16.000Z
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -940,13 +940,15 @@ func ConvertUser(dbUser database.User) User {
 		hash := sha256.Sum256([]byte(dbUser.Email[:atSymbol]))
 		emailHashed = fmt.Sprintf("%x%s", hash[:], dbUser.Email[atSymbol:])
 	}
+	loginType := string(dbUser.LoginType)
 	return User{
 		ID:              dbUser.ID,
 		EmailHashed:     emailHashed,
 		RBACRoles:       dbUser.RBACRoles,
 		CreatedAt:       dbUser.CreatedAt,
 		Status:          dbUser.Status,
 		GithubComUserID: dbUser.GithubComUserID.Int64,
+		LoginType:       &loginType,
 	}
 }
 
@@ -1149,6 +1151,9 @@ type User struct {
 	RBACRoles       []string            `json:"rbac_roles"`
 	Status          database.UserStatus `json:"status"`
 	GithubComUserID int64               `json:"github_com_user_id"`
+	// LoginType is nullable for backwards compatibility.
+	// We used to not set it at all.
+	LoginType *string `json:"login_type"`
 }
 
 type Group struct {

Original file line number	Diff line number	Diff line change
`@@ -940,13 +940,15 @@ func ConvertUser(dbUser database.User) User {`
`940`	`940`	`hash := sha256.Sum256([]byte(dbUser.Email[:atSymbol]))`
`941`	`941`	`emailHashed = fmt.Sprintf("%x%s", hash[:], dbUser.Email[atSymbol:])`
`942`	`942`	`}`
	`943`	`+ loginType := string(dbUser.LoginType)`
`943`	`944`	`return User{`
`944`	`945`	`ID: dbUser.ID,`
`945`	`946`	`EmailHashed: emailHashed,`
`946`	`947`	`RBACRoles: dbUser.RBACRoles,`
`947`	`948`	`CreatedAt: dbUser.CreatedAt,`
`948`	`949`	`Status: dbUser.Status,`
`949`	`950`	`GithubComUserID: dbUser.GithubComUserID.Int64,`
	`951`	`+ LoginType: &loginType,`
`950`	`952`	`}`
`951`	`953`	`}`
`952`	`954`
`@@ -1149,6 +1151,9 @@ type User struct {`
`1149`	`1151`	RBACRoles []string `json:"rbac_roles"`
`1150`	`1152`	Status database.UserStatus `json:"status"`
`1151`	`1153`	GithubComUserID int64 `json:"github_com_user_id"`
	`1154`	`+ // LoginType is nullable for backwards compatibility.`
	`1155`	`+ // We used to not set it at all.`
	`1156`	+ LoginType *string `json:"login_type"`
`1152`	`1157`	`}`
`1153`	`1158`
`1154`	`1159`	`type Group struct {`