Skip to content

Change decrypt password in notification channel repository #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanTolksdorf merged 1 commit into from
Jan 26, 2026
Merged

Change decrypt password in notification channel repository #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions pkg/repository/notificationrepository/notificationChannelRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ type NotificationChannelRepository struct {
encryptManager port.EncryptManager
}

func NewNotificationChannelRepository(db *sqlx.DB, encryptService port.EncryptManager) (port.NotificationChannelRepository, error) {
func NewNotificationChannelRepository(
db *sqlx.DB,
encryptService port.EncryptManager,
) (port.NotificationChannelRepository, error) {
if db == nil {
return nil, errors.New("nil db reference")
}
Expand Down Expand Up @@ -75,7 +78,7 @@ func (r *NotificationChannelRepository) CreateNotificationChannel(
) (models.NotificationChannel, error) {
insertRow := toNotificationChannelRow(channelIn)

rowWithEncryption, err := r.withEncryptedValues(insertRow)
rowWithEncryption, err := r.encrypt(insertRow)
if err != nil {
return models.NotificationChannel{}, fmt.Errorf("could not encrypt password: %w", err)
}
Expand Down Expand Up @@ -105,7 +108,7 @@ func (r *NotificationChannelRepository) CreateNotificationChannel(
return models.NotificationChannel{}, fmt.Errorf("could not commit transaction: %w", err)
}

return r.withPasswordDecrypted(row).ToModel(), nil
return r.decrypt(row).ToModel(), nil
}

func (r *NotificationChannelRepository) GetNotificationChannelByIdAndType(
Expand All @@ -120,7 +123,7 @@ func (r *NotificationChannelRepository) GetNotificationChannelByIdAndType(
return models.NotificationChannel{}, fmt.Errorf("select by id failed: %w", err)
}

return row.ToModel(), nil
return r.decrypt(row).ToModel(), nil
}

func (r *NotificationChannelRepository) ListNotificationChannelsByType(
Expand All @@ -136,7 +139,7 @@ func (r *NotificationChannelRepository) ListNotificationChannelsByType(

result := make([]models.NotificationChannel, 0, len(rows))
for _, row := range rows {
result = append(result, r.withPasswordDecrypted(row).ToModel())
result = append(result, r.decrypt(row).ToModel())
}

return result, nil
Expand All @@ -151,7 +154,7 @@ func (r *NotificationChannelRepository) UpdateNotificationChannel(
rowIn := toNotificationChannelRow(in)
rowIn.Id = &id

rowWithEncryption, err := r.withEncryptedValues(rowIn)
rowWithEncryption, err := r.encrypt(rowIn)
if err != nil {
return models.NotificationChannel{}, fmt.Errorf("could not encrypt password: %w", err)
}
Expand Down Expand Up @@ -181,10 +184,10 @@ func (r *NotificationChannelRepository) UpdateNotificationChannel(
return in, fmt.Errorf("could not commit transaction: %w", err)
}

return r.withPasswordDecrypted(row).ToModel(), nil
return r.decrypt(row).ToModel(), nil
}

func (r *NotificationChannelRepository) withEncryptedValues(row notificationChannelRow) (notificationChannelRow, error) {
func (r *NotificationChannelRepository) encrypt(row notificationChannelRow) (notificationChannelRow, error) {
if row.Password != nil && strings.TrimSpace(*row.Password) != "" {
encryptedPasswd, err := r.encryptManager.Encrypt(*row.Password)
if err != nil {
Expand All @@ -208,7 +211,7 @@ func (r *NotificationChannelRepository) withEncryptedValues(row notificationChan
return row, nil
}

func (r *NotificationChannelRepository) withPasswordDecrypted(row notificationChannelRow) notificationChannelRow {
func (r *NotificationChannelRepository) decrypt(row notificationChannelRow) notificationChannelRow {
if row.Password != nil && strings.TrimSpace(*row.Password) != "" {
dPasswd := *row.Password
dcPassword, err := r.encryptManager.Decrypt([]byte(dPasswd))
Expand Down
Loading