vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 61f90818273190c3c4211e15f153cb4d7a34a78e
parent 1c7338c7c4c7cb5b59f9cc710f0667e21346cfbf
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Mon, 10 Jul 2023 17:59:53 +0200

Merge pull request #3678 from BlackDex/fix-org-api-creation-postgres

Fix Org API Key generation on PosgreSQL
Diffstat:
Msrc/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)