From 338e1250b73e9bbb8fab88702e7df86facac6caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Larivi=C3=A8re?=
 <ralariviere@devolutions.net>
Date: Tue, 1 Jul 2025 14:40:57 -0400
Subject: [PATCH] feat!: support username + password in private key secret
 entry

---
 .github/workflows/test.yml |  1 -
 VERSION                    |  2 +-
 entry_credential.go        |  9 +++++----
 entry_credential_test.go   | 12 +++++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index adeb9df..6043e5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,7 +70,6 @@ jobs:
           TEST_CERTIFICATE_ENTRY_ID: ${{ secrets.TEST_CERTIFICATE_ENTRY_ID }}
           TEST_CERTIFICATE_FILE_PATH: '${{ runner.temp }}/test.p12'
           TEST_HOST_ENTRY_ID: ${{ secrets.TEST_HOST_ENTRY_ID }}
-          TEST_USER_ENTRY_ID: ${{ secrets.TEST_USER_ENTRY_ID }}
           TEST_WEBSITE_ENTRY_ID: ${{ secrets.TEST_WEBSITE_ENTRY_ID }}
         with:
           github_token: ${{ secrets.DEVOLUTIONSBOT_TOKEN }}
diff --git a/VERSION b/VERSION
index 26acbf0..54d1a4f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12.2
+0.13.0
diff --git a/entry_credential.go b/entry_credential.go
index 770e9ef..e2aec5a 100644
--- a/entry_credential.go
+++ b/entry_credential.go
@@ -48,10 +48,11 @@ type EntryCredentialDefaultData struct {
 }
 
 type EntryCredentialPrivateKeyData struct {
-	PrivateKey       string `json:"privateKeyData,omitempty"`
-	PublicKey        string `json:"publicKeyData,omitempty"`
-	OverridePassword string `json:"privateKeyOverridePassword,omitempty"`
-	Passphrase       string `json:"privateKeyPassPhrase,omitempty"`
+	Username   string `json:"privateKeyOverrideUsername,omitempty"`
+	Password   string `json:"privateKeyOverridePassword,omitempty"`
+	PrivateKey string `json:"privateKeyData,omitempty"`
+	PublicKey  string `json:"publicKeyData,omitempty"`
+	Passphrase string `json:"privateKeyPassPhrase,omitempty"`
 }
 
 func (e *Entry) GetCredentialAccessCodeData() (*EntryCredentialAccessCodeData, bool) {
diff --git a/entry_credential_test.go b/entry_credential_test.go
index ad93563..871ef69 100644
--- a/entry_credential_test.go
+++ b/entry_credential_test.go
@@ -201,10 +201,11 @@ func test_NewUserEntry(t *testing.T) {
 		Tags:        []string{"testtag"},
 
 		Data: EntryCredentialPrivateKeyData{
-			PrivateKey:       "-----BEGIN PRIVATE KEY-----\abcdefghijklmnopqrstuvwxyz1234567890...\n-----END PRIVATE",
-			PublicKey:        "-----BEGIN PUBLIC KEY-----\abcdefghijklmnopqrstuvwxyz...\n-----END PUBLIC KEY-----",
-			OverridePassword: "override-password",
-			Passphrase:       "passphrase",
+			Username:   "testuser",
+			Password:   "password",
+			PrivateKey: "-----BEGIN PRIVATE KEY-----\abcdefghijklmnopqrstuvwxyz1234567890...\n-----END PRIVATE",
+			PublicKey:  "-----BEGIN PUBLIC KEY-----\abcdefghijklmnopqrstuvwxyz...\n-----END PUBLIC KEY-----",
+			Passphrase: "passphrase",
 		},
 	}
 
@@ -404,8 +405,9 @@ func test_UpdateUserEntry(t *testing.T) {
 	if !ok {
 		t.Fatalf("Failed to get credential access code data from entry: %v", updatedCredentialAccessCodeEntry)
 	}
+	updatedPrivateKeyData.Username = updatedPrivateKeyData.Username + "-updated"
+	updatedPrivateKeyData.Password = updatedPrivateKeyData.Password + "-updated"
 	updatedPrivateKeyData.Passphrase = updatedPrivateKeyData.Passphrase + "-updated"
-	updatedPrivateKeyData.OverridePassword = updatedPrivateKeyData.OverridePassword + "-updated"
 	updatedCredentialPrivateKeyEntry.Data = updatedPrivateKeyData
 
 	updatedCredentialPrivateKeyEntry, err = testClient.Entries.Credential.Update(updatedCredentialPrivateKeyEntry)