From 08a4cbff2448b92f96e812cd9ac37dba74581453 Mon Sep 17 00:00:00 2001 From: peintnermax Date: Wed, 11 Sep 2024 09:27:04 +0200 Subject: [PATCH] listusers with loginname --- apps/login/src/lib/server/loginname.ts | 2 +- apps/login/src/lib/server/password.ts | 2 +- apps/login/src/lib/zitadel.ts | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts index cb478afcdea..d1ed61128b8 100644 --- a/apps/login/src/lib/server/loginname.ts +++ b/apps/login/src/lib/server/loginname.ts @@ -20,7 +20,7 @@ export type SendLoginnameCommand = { export async function sendLoginname(command: SendLoginnameCommand) { const users = await listUsers({ - userName: command.loginName, + loginName: command.loginName, organizationId: command.organization, }); diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts index 020630cf1e8..88f3c628d2f 100644 --- a/apps/login/src/lib/server/password.ts +++ b/apps/login/src/lib/server/password.ts @@ -9,7 +9,7 @@ type ResetPasswordCommand = { export async function resetPassword(command: ResetPasswordCommand) { const users = await listUsers({ - userName: command.loginName, + loginName: command.loginName, organizationId: command.organization, }); diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index e61e255b8a2..984ffb5402f 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -258,23 +258,39 @@ export async function getUserByID(userId: string) { } export async function listUsers({ + loginName, userName, email, organizationId, }: { + loginName?: string; userName?: string; email?: string; organizationId?: string; }) { const queries: SearchQuery[] = []; + if (loginName) { + queries.push( + create(SearchQuerySchema, { + query: { + case: "loginNameQuery", + value: { + loginName: loginName, + method: TextQueryMethod.EQUALS, + }, + }, + }), + ); + } + if (userName) { queries.push( create(SearchQuerySchema, { query: { case: "userNameQuery", value: { - userName, + userName: userName, method: TextQueryMethod.EQUALS, }, },