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 d9c0c23819fdd327750931103a1ec3e625a257a4
parent b7c9a346c1f7f664f2bda997632cb14fdd55b94d
Author: BlackDex <black.dex@gmail.com>
Date:   Mon, 12 Dec 2022 12:21:48 +0100

Revert collection queries back to `left_join`

Using the `inner_join` seems to cause issues, even though i have tested
it. Strangely it does cause issues. Reverting it back to `left_join`
seems to solve the issue for me.

Fixes #2975

Diffstat:
Msrc/db/models/collection.rs | 12++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs @@ -167,15 +167,15 @@ impl Collection { users_collections::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(users_organizations::table.on( + .left_join(users_organizations::table.on( collections::org_uuid.eq(users_organizations::org_uuid).and( users_organizations::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(groups_users::table.on( + .left_join(groups_users::table.on( groups_users::users_organizations_uuid.eq(users_organizations::uuid) )) - .inner_join(groups::table.on( + .left_join(groups::table.on( groups::uuid.eq(groups_users::groups_uuid) )) .left_join(collections_groups::table.on( @@ -252,15 +252,15 @@ impl Collection { users_collections::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(users_organizations::table.on( + .left_join(users_organizations::table.on( collections::org_uuid.eq(users_organizations::org_uuid).and( users_organizations::user_uuid.eq(user_uuid) ) )) - .inner_join(groups_users::table.on( + .left_join(groups_users::table.on( groups_users::users_organizations_uuid.eq(users_organizations::uuid) )) - .inner_join(groups::table.on( + .left_join(groups::table.on( groups::uuid.eq(groups_users::groups_uuid) )) .left_join(collections_groups::table.on(