Remove user details from mediator database (#1304)

Fix #1279

cmd/cli/app/auth/auth_login.go

@@ -206,18 +206,6 @@ func renderNewUser(cmd *cobra.Command, newUser *pb.CreateUserResponse) {
 		{"Project Name", newUser.ProjectName},
 	}
 
-	if newUser.Email != nil {
-		rows = append(rows, table.Row{"Email", *newUser.Email})
-	}
-
-	if newUser.FirstName != nil {
-		rows = append(rows, table.Row{"First Name", *newUser.FirstName})
-	}
-
-	if newUser.LastName != nil {
-		rows = append(rows, table.Row{"Last Name", *newUser.LastName})
-	}
-
 	renderUserToTable(cmd, rows)
 }
 
@@ -236,19 +224,6 @@ func renderUserInfo(cmd *cobra.Command, user *pb.GetUserResponse) {
 		{projectKey, strings.Join(projects, ", ")},
 	}
 
-	userInfo := user.GetUser()
-	if userInfo.Email != nil {
-		rows = append(rows, table.Row{"Email", *userInfo.Email})
-	}
-
-	if userInfo.FirstName != nil {
-		rows = append(rows, table.Row{"First Name", *userInfo.FirstName})
-	}
-
-	if userInfo.LastName != nil {
-		rows = append(rows, table.Row{"Last Name", *userInfo.LastName})
-	}
-
 	renderUserToTable(cmd, rows)
 }
 

database/migrations/000004_remove_personal_info.down.sql

@@ -0,0 +1,19 @@
+-- Copyright 2023 Stacklok, Inc
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- Add personal user details to users table
+ALTER TABLE users
+    ADD COLUMN email TEXT,
+    ADD COLUMN first_name TEXT,
+    ADD COLUMN last_name TEXT;

database/migrations/000004_remove_personal_info.up.sql

@@ -0,0 +1,19 @@
+-- Copyright 2023 Stacklok, Inc
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- Remove personal user details from users table
+ALTER TABLE users
+    DROP COLUMN IF EXISTS email,
+    DROP COLUMN IF EXISTS first_name,
+    DROP COLUMN IF EXISTS last_name;

database/query/users.sql

@@ -1,5 +1,5 @@
 -- name: CreateUser :one
-INSERT INTO users (organization_id, email, identity_subject, first_name, last_name) VALUES ($1, $2, $3, $4, $5) RETURNING *;
+INSERT INTO users (organization_id, identity_subject) VALUES ($1, $2) RETURNING *;
 
 -- name: GetUserByID :one
 SELECT * FROM users WHERE id = $1;

internal/controlplane/handlers_user.go

@@ -34,13 +34,6 @@ import (
 	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
-func stringToNullString(s string) *sql.NullString {
-	if s == "" {
-		return &sql.NullString{Valid: false}
-	}
-	return &sql.NullString{String: s, Valid: true}
-}
-
 // CreateUser is a service for user self registration
 //
 //gocyclo:ignore
@@ -102,9 +95,6 @@ func (s *Server) CreateUser(ctx context.Context,
 	userOrg = organization.ID
 	userProject = uuid.MustParse(orgProject.ProjectId)
 	user, err := qtx.CreateUser(ctx, db.CreateUserParams{OrganizationID: userOrg,
-		Email:           *stringToNullString(token.Email()),
-		FirstName:       *stringToNullString(token.GivenName()),
-		LastName:        *stringToNullString(token.FamilyName()),
 		IdentitySubject: subject})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create user: %s", err)
@@ -132,10 +122,7 @@ func (s *Server) CreateUser(ctx context.Context,
 		OrganizatioName: organization.Name,
 		ProjectId:       userProject.String(),
 		ProjectName:     orgProject.Name,
-		Email:           &user.Email.String,
 		IdentitySubject: user.IdentitySubject,
-		FirstName:       &user.FirstName.String,
-		LastName:        &user.LastName.String,
 		CreatedAt:       timestamppb.New(user.CreatedAt),
 	}, nil
 }
@@ -250,10 +237,7 @@ func (s *Server) GetUser(ctx context.Context, _ *pb.GetUserRequest) (*pb.GetUser
 	resp.User = &pb.UserRecord{
 		Id:              user.ID,
 		OrganizationId:  user.OrganizationID.String(),
-		Email:           &user.Email.String,
 		IdentitySubject: user.IdentitySubject,
-		FirstName:       &user.FirstName.String,
-		LastName:        &user.LastName.String,
 		CreatedAt:       timestamppb.New(user.CreatedAt),
 		UpdatedAt:       timestamppb.New(user.UpdatedAt),
 	}

internal/controlplane/handlers_user_test.go

@@ -71,9 +71,6 @@ func TestCreateUserDBMock(t *testing.T) {
 					ID:              1,
 					OrganizationID:  orgID,
 					IdentitySubject: "subject1",
-					Email:           sql.NullString{String: "[email protected]", Valid: true},
-					FirstName:       sql.NullString{String: "Foo", Valid: true},
-					LastName:        sql.NullString{String: "Bar", Valid: true},
 					CreatedAt:       time.Now(),
 					UpdatedAt:       time.Now(),
 				}
@@ -98,10 +95,7 @@ func TestCreateUserDBMock(t *testing.T) {
 				store.EXPECT().CreateProvider(gomock.Any(), gomock.Any())
 				store.EXPECT().
 					CreateUser(gomock.Any(), db.CreateUserParams{OrganizationID: orgID,
-						IdentitySubject: "subject1",
-						Email:           sql.NullString{String: "[email protected]", Valid: true},
-						FirstName:       sql.NullString{String: "Foo", Valid: true},
-						LastName:        sql.NullString{String: "Bar", Valid: true}}).
+						IdentitySubject: "subject1"}).
 					Return(returnedUser, nil)
 				store.EXPECT().AddUserProject(gomock.Any(), db.AddUserProjectParams{UserID: 1, ProjectID: projectID})
 				store.EXPECT().AddUserRole(gomock.Any(), db.AddUserRoleParams{UserID: 1, RoleID: 2})
@@ -117,10 +111,7 @@ func TestCreateUserDBMock(t *testing.T) {
 				assert.NoError(t, err)
 				assert.NotNil(t, res)
 				assert.Equal(t, int32(1), res.Id)
-				assert.Equal(t, "[email protected]", *res.Email)
 				assert.Equal(t, orgID.String(), res.OrganizationId)
-				assert.Equal(t, "Foo", *res.FirstName)
-				assert.Equal(t, "Bar", *res.LastName)
 			},
 		},
 	}