Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: service account login broken after principal store split (#19163)
Vincent Huangdd3d2b02198e
diff --git a/backend/store/principal.go b/backend/store/principal.goindex af872c5def..e63545c11d 100644--- a/backend/store/principal.go+++ b/backend/store/principal.go@@ -105,6 +105,7 @@ func (s *Store) GetPrincipalByEmail(ctx context.Context, email string) (*UserMesID: sa.ID,Email: sa.Email,Name: sa.Name,+ PasswordHash: sa.PasswordHash,Type: storepb.PrincipalType_SERVICE_ACCOUNT,MemberDeleted: sa.MemberDeleted,MFAConfig: &storepb.MFAConfig{},diff --git a/backend/store/principal_service_account.go b/backend/store/principal_service_account.goindex 8896b1cb54..88b16b50f6 100644--- a/backend/store/principal_service_account.go+++ b/backend/store/principal_service_account.go@@ -18,6 +18,7 @@ type ServiceAccountMessage struct {// Email must be lower case, format: {name}@{project-id}.service.bytebase.com or {name}@service.bytebase.comEmail stringName string+ PasswordHash stringMemberDeleted bool// Project is the owning project. NULL for workspace-level service accounts.Project *string@@ -95,6 +96,7 @@ func (s *Store) ListServiceAccounts(ctx context.Context, find *FindServiceAccoundeleted,email,name,+ password_hash,projectFROM principalWHERE ?@@ -128,6 +130,7 @@ func (s *Store) ListServiceAccounts(ctx context.Context, find *FindServiceAccoun&sa.MemberDeleted,&sa.Email,&sa.Name,+ &sa.PasswordHash,&project,); err != nil {return nil, err@@ -178,10 +181,11 @@ func (s *Store) CreateServiceAccount(ctx context.Context, create *CreateServiceA}return &ServiceAccountMessage{- ID: saID,- Email: email,- Name: create.Name,- Project: create.Project,+ ID: saID,+ Email: email,+ Name: create.Name,+ PasswordHash: create.PasswordHash,+ Project: create.Project,}, nil}@@ -203,7 +207,7 @@ func (s *Store) UpdateServiceAccount(ctx context.Context, sa *ServiceAccountMess}sqlStr, args, err := qb.Q().Space(`UPDATE principal SET ? WHERE id = ?- RETURNING id, deleted, email, name, project`,+ RETURNING id, deleted, email, name, password_hash, project`,set, sa.ID).ToSQL()if err != nil {return nil, errors.Wrapf(err, "failed to build sql")@@ -216,6 +220,7 @@ func (s *Store) UpdateServiceAccount(ctx context.Context, sa *ServiceAccountMess&updated.MemberDeleted,&updated.Email,&updated.Name,+ &updated.PasswordHash,&project,); err != nil {return nil, errdiff --git a/frontend/src/components/User/Settings/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vueindex 02290ba370..c1f889ef37 100644--- a/frontend/src/components/User/Settings/ServiceAccountPanel.vue+++ b/frontend/src/components/User/Settings/ServiceAccountPanel.vue@@ -82,7 +82,7 @@<CreateServiceAccountDrawerv-if="state.showCreateDrawer":service-account="state.editingServiceAccount"- :project="project.name"+ :project="projectId ? project.name : undefined"@close="() => {state.showCreateDrawer = false;