User: Add uid colum to user table (#81615)

pkg/api/dtos/models.go

@@ -30,6 +30,7 @@ type LoginCommand struct {
 type CurrentUser struct {
 	IsSignedIn                 bool               `json:"isSignedIn"`
 	Id                         int64              `json:"id"`
+	UID                        string             `json:"uid"`
 	Login                      string             `json:"login"`
 	Email                      string             `json:"email"`
 	Name                       string             `json:"name"`

pkg/api/index.go

@@ -92,6 +92,7 @@ func (hs *HTTPServer) setIndexViewData(c *contextmodel.ReqContext) (*dtos.IndexV
 	data := dtos.IndexViewData{
 		User: &dtos.CurrentUser{
 			Id:                         userID,
+			UID:                        c.UserUID, // << not set yet
 			IsSignedIn:                 c.IsSignedIn,
 			Login:                      c.Login,
 			Email:                      c.SignedInUser.GetEmail(),

pkg/api/user_test.go

@@ -82,6 +82,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 		}
 		usr, err := userSvc.Create(context.Background(), &createUserCmd)
 		require.NoError(t, err)
+		theUserUID := usr.UID
 
 		sc.handlerFunc = hs.GetUserByID
 
@@ -108,6 +109,7 @@ func TestUserAPIEndpoint_userLoggedIn(t *testing.T) {
 
 		expected := user.UserProfileDTO{
 			ID:             1,
+			UID:            theUserUID, // from original request
 			Email:          "user@test.com",
 			Name:           "user",
 			Login:          "loginuser",