chore: fix types

apps/login/src/lib/zitadel.ts

@@ -18,12 +18,14 @@ import {
 import { IDPInformation } from "@zitadel/proto/zitadel/user/v2/idp_pb";
 
 import { CreateCallbackRequest } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
-import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
+import type { RedirectURLsJson } from "@zitadel/proto/zitadel/user/v2/idp_pb";
-import type { RedirectURLs } from "@zitadel/proto/zitadel/user/v2/idp_pb";
+import {
-import { PartialMessage, PlainMessage } from "@zitadel/client";
+  SearchQuery,
-import { SearchQuery as UserSearchQuery } from "@zitadel/proto/zitadel/user/v2/query_pb";
+  SearchQuerySchema,
-import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
+} from "@zitadel/proto/zitadel/user/v2/query_pb";
 import { PROVIDER_MAPPING } from "./idp";
+import { createMessage } from "@zitadel/client";
+import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
 
 const SESSION_LIFETIME_S = 3000;
 
@@ -121,8 +123,8 @@ export async function getPasswordComplexitySettings(organization?: string) {
 }
 
 export async function createSessionFromChecks(
-  checks: PlainMessage<Checks>,
+  checks: Checks,
-  challenges: PlainMessage<RequestChallenges> | undefined,
+  challenges: RequestChallenges | undefined,
 ) {
   return sessionService.createSession(
     {
@@ -165,7 +167,7 @@ export async function setSession(
   sessionId: string,
   sessionToken: string,
   challenges: RequestChallenges | undefined,
-  checks?: PlainMessage<Checks>,
+  checks?: Checks,
 ) {
   return sessionService.setSession(
     {
@@ -248,48 +250,49 @@ export async function listUsers({
   email?: string;
   organizationId?: string;
 }) {
-  const queries: PartialMessage<UserSearchQuery>[] = [];
+  const queries: SearchQuery[] = [];
 
   if (userName) {
-    queries.push({
+    queries.push(
-      query: {
+      createMessage(SearchQuerySchema, {
-        case: "userNameQuery",
+        query: {
-        value: {
+          case: "userNameQuery",
-          userName,
+          value: {
-          method: TextQueryMethod.EQUALS,
+            userName,
+            method: TextQueryMethod.EQUALS,
+          },
         },
-      },
+      }),
-    });
+    );
   }
 
   if (organizationId) {
-    queries.push({
+    queries.push(
-      query: {
+      createMessage(SearchQuerySchema, {
-        case: "organizationIdQuery",
+        query: {
-        value: {
+          case: "organizationIdQuery",
-          organizationId,
+          value: {
+            organizationId,
+          },
         },
-      },
+      }),
-    });
+    );
   }
 
   if (email) {
-    queries.push({
+    queries.push(
-      query: {
+      createMessage(SearchQuerySchema, {
-        case: "emailQuery",
+        query: {
-        value: {
+          case: "emailQuery",
-          emailAddress: email,
+          value: {
+            emailAddress: email,
+          },
         },
-      },
+      }),
-    });
+    );
   }
 
-  return userService.listUsers(
+  return userService.listUsers({ queries: queries });
-    {
-      queries: queries,
-    },
-    {},
-  );
 }
 
 export async function getOrgByDomain(domain: string) {
@@ -301,7 +304,7 @@ export async function startIdentityProviderFlow({
   urls,
 }: {
   idpId: string;
-  urls: PlainMessage<RedirectURLs>;
+  urls: RedirectURLsJson;
 }) {
   return userService.startIdentityProviderIntent({
     idpId,
@@ -332,7 +335,7 @@ export async function getAuthRequest({
   });
 }
 
-export async function createCallback(req: PlainMessage<CreateCallbackRequest>) {
+export async function createCallback(req: CreateCallbackRequest) {
   return oidcService.createCallback(req);
 }
 
@@ -465,7 +468,7 @@ export async function registerU2F(userId: string, domain: string) {
  * @returns the newly set email
  */
 export async function verifyU2FRegistration(
-  request: PlainMessage<VerifyU2FRegistrationRequest>,
+  request: VerifyU2FRegistrationRequest,
 ) {
   return userService.verifyU2FRegistration(request, {});
 }
@@ -483,10 +486,8 @@ export async function getActiveIdentityProviders(orgId?: string) {
  * @returns the newly set email
  */
 export async function verifyPasskeyRegistration(
-  request: PartialMessage<VerifyPasskeyRegistrationRequest>,
+  request: VerifyPasskeyRegistrationRequest,
 ) {
-  // TODO: find a better way to handle this
-  request = VerifyPasskeyRegistrationRequest.fromJson(request as any);
   return userService.verifyPasskeyRegistration(request, {});
 }