TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-12 14:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix user query

Browse Source
This commit is contained in:
Max Peintner
2025-01-02 13:10:01 +01:00
parent 9a931d9376
commit d62093e48b
1 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
apps/login/src/lib/zitadel.ts
View File

@@ -311,7 +311,7 @@ export async function listUsers({
}: ListUsersCommand) {
const queries: SearchQuery[] = [];
// either loginName or userName and email or phone are required
// either use loginName or userName, email, phone
if (loginName) {
queries.push(
create(SearchQuerySchema, {
@@ -324,18 +324,20 @@ export async function listUsers({
},
}),
);
} else if (userName && (email || phone)) {
const userNameQuery = create(SearchQuerySchema, {
query: {
case: "userNameQuery",
value: {
userName: userName,
method: TextQueryMethod.EQUALS,
} else if (userName || email || phone) {
const orQueries: SearchQuery[] = [];
if (userName) {
const userNameQuery = create(SearchQuerySchema, {
query: {
case: "userNameQuery",
value: {
userName: userName,
method: TextQueryMethod.EQUALS,
},
},
},
});
const orQueries: SearchQuery[] = [userNameQuery];
});
orQueries.push(userNameQuery);
}
if (email) {
const emailQuery = create(SearchQuerySchema, {
@@ -351,17 +353,16 @@ export async function listUsers({
}
if (phone) {
// TODO add after https://github.com/zitadel/zitadel/issues/9016 is merged
// const phoneQuery = create(SearchQuerySchema, {
// query: {
// case: "phoneQuery",
// value: {
// emailAddress: email,
// method: TextQueryMethod.EQUALS,
// },
// },
// });
// orQueries.push(phoneQuery);
const phoneQuery = create(SearchQuerySchema, {
query: {
case: "phoneQuery",
value: {
number: phone,
method: TextQueryMethod.EQUALS,
},
},
});
orQueries.push(phoneQuery);
}
queries.push(
@@ -374,18 +375,6 @@ export async function listUsers({
},
}),
);
} else if (userName) {
queries.push(
create(SearchQuerySchema, {
query: {
case: "userNameQuery",
value: {
userName: userName,
method: TextQueryMethod.EQUALS,
},
},
}),
);
}
if (organizationId) {