vw_small

commit a8e5384c4ab944afb469f5f9a0ac89be0f68f573
parent 1c7338c7c4c7cb5b59f9cc710f0667e21346cfbf
Author: BlackDex <black.dex@gmail.com>
Date:   Mon, 10 Jul 2023 15:29:06 +0200

Fix Org API Key generation on PosgreSQL

Using PostgreSQL creating or rotating the Org API Key failed because of
some query mismatch. This PR fixes that.

Fixes https://github.com/dani-garcia/vaultwarden/discussions/3671#discussioncomment-6400394

Diffstat:
M
src/db/models/organization.rs
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
@@ -804,7 +804,7 @@ impl OrganizationApiKey {
                 let value = OrganizationApiKeyDb::to_db(self);
                 diesel::insert_into(organization_api_key::table)
                     .values(&value)
-                    .on_conflict(organization_api_key::uuid)
+                    .on_conflict((organization_api_key::uuid, organization_api_key::org_uuid))
                     .do_update()
                     .set(&value)
                     .execute(conn)