From 3f1ea205497fddba51cf00a9dfb13a729befe0f7 Mon Sep 17 00:00:00 2001
From: Benjamin Cavy <benjamin.cavy@gmail.com>
Date: Thu, 26 Sep 2024 10:17:00 +0200
Subject: [PATCH] fix: avoid 404 when user is admin on tenant right endpoint

---
 app/fr/maif/izanami/datastores/UsersDatastore.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/fr/maif/izanami/datastores/UsersDatastore.scala b/app/fr/maif/izanami/datastores/UsersDatastore.scala
index 06ab8da6..44a3d1a3 100644
--- a/app/fr/maif/izanami/datastores/UsersDatastore.scala
+++ b/app/fr/maif/izanami/datastores/UsersDatastore.scala
@@ -1403,8 +1403,9 @@ class UsersDatastore(val env: Env) extends Datastore {
              |    'keys', COALESCE((select json_object_agg(k.apikey, json_build_object('level', k.level)) from users_keys_rights k where k.username=$$1), '{}'),
              |    'webhooks', COALESCE((select json_object_agg(w.webhook, json_build_object('level', w.level)) from users_webhooks_rights w where w.username=$$1), '{}')
              |)::jsonb as rights
-             |from izanami.users u, izanami.users_tenants_rights utr
-             |WHERE u.username=$$1 AND utr.username=$$1 AND utr.tenant=$$2;
+             |from izanami.users u
+             |left join izanami.users_tenants_rights utr on (utr.username = u.username AND utr.tenant=$$2)
+             |WHERE u.username=$$1;
              |""".stripMargin,
               List(username, tenant),
               schemas = Set(tenant)