From d5f35fbd546d4925d760067863da0bf55deb7b46 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Wed, 11 Mar 2026 09:20:21 +0100 Subject: [PATCH] fix(console): switch to webkeys v2 (from v2beta) (#11807) # Which Problems Are Solved The Management Console was still using the deprecate v2beta endpoints of the webkey service even though the v2 service was move to GA a while ago. # How the Problems Are Solved Switch to the v2 endpoints. # Additional Changes None # Additional Context - relates to #10773 --- .../oidc-webkeys-create/oidc-webkeys-create.component.ts | 4 ++-- .../oidc-webkeys-inactive-table.component.ts | 2 +- .../oidc-webkeys-table/oidc-webkeys-table.component.ts | 2 +- .../modules/policies/oidc-webkeys/oidc-webkeys.component.ts | 6 +++--- console/src/app/services/grpc.service.ts | 2 +- console/src/app/services/webkeys.service.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-create/oidc-webkeys-create.component.ts b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-create/oidc-webkeys-create.component.ts index 589931917..819d430d7 100644 --- a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-create/oidc-webkeys-create.component.ts +++ b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-create/oidc-webkeys-create.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, signal, WritableSignal } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { WebKey } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; +import { WebKey } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; import { ReplaySubject } from 'rxjs'; -import { RSAHasher, RSABits, ECDSACurve } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; +import { RSAHasher, RSABits, ECDSACurve } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; type RawValue = ReturnType; diff --git a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-inactive-table/oidc-webkeys-inactive-table.component.ts b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-inactive-table/oidc-webkeys-inactive-table.component.ts index b55046e3e..424ab3dde 100644 --- a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-inactive-table/oidc-webkeys-inactive-table.component.ts +++ b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-inactive-table/oidc-webkeys-inactive-table.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ReplaySubject } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { MatTableDataSource } from '@angular/material/table'; -import { WebKey } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; +import { WebKey } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; @Component({ selector: 'cnsl-oidc-webkeys-inactive-table', diff --git a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-table/oidc-webkeys-table.component.ts b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-table/oidc-webkeys-table.component.ts index 7d2447761..5f343d84e 100644 --- a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-table/oidc-webkeys-table.component.ts +++ b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys-table/oidc-webkeys-table.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from import { ReplaySubject } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { MatTableDataSource } from '@angular/material/table'; -import { State, WebKey } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; +import { State, WebKey } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; @Component({ selector: 'cnsl-oidc-webkeys-table', diff --git a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys.component.ts b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys.component.ts index 86b9af836..504244fb4 100644 --- a/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys.component.ts +++ b/console/src/app/modules/policies/oidc-webkeys/oidc-webkeys.component.ts @@ -9,9 +9,9 @@ import { TimestampToDatePipe } from 'src/app/pipes/timestamp-to-date-pipe/timest import { MatDialog } from '@angular/material/dialog'; import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { State, WebKey } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; -import { CreateWebKeyRequestSchema } from '@zitadel/proto/zitadel/webkey/v2beta/webkey_service_pb'; -import { RSAHasher, RSABits, ECDSACurve } from '@zitadel/proto/zitadel/webkey/v2beta/key_pb'; +import { State, WebKey } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; +import { CreateWebKeyRequestSchema } from '@zitadel/proto/zitadel/webkey/v2/webkey_service_pb'; +import { RSAHasher, RSABits, ECDSACurve } from '@zitadel/proto/zitadel/webkey/v2/key_pb'; const CACHE_WARNING_MS = 5 * 60 * 1000; // 5 minutes diff --git a/console/src/app/services/grpc.service.ts b/console/src/app/services/grpc.service.ts index 90cf603ce..0b2d0fa90 100644 --- a/console/src/app/services/grpc.service.ts +++ b/console/src/app/services/grpc.service.ts @@ -26,7 +26,7 @@ import { createAdminServiceClient, createAuthServiceClient, createManagementServ import { createGrpcWebTransport } from '@connectrpc/connect-web'; import { createClientFor } from '@zitadel/client'; -import { WebKeyService } from '@zitadel/proto/zitadel/webkey/v2beta/webkey_service_pb'; +import { WebKeyService } from '@zitadel/proto/zitadel/webkey/v2/webkey_service_pb'; import { ActionService } from '@zitadel/proto/zitadel/action/v2/action_service_pb'; const createWebKeyServiceClient = createClientFor(WebKeyService); diff --git a/console/src/app/services/webkeys.service.ts b/console/src/app/services/webkeys.service.ts index b70b60da8..45efa0d62 100644 --- a/console/src/app/services/webkeys.service.ts +++ b/console/src/app/services/webkeys.service.ts @@ -7,7 +7,7 @@ import { CreateWebKeyRequestSchema, CreateWebKeyResponse, ActivateWebKeyResponse, -} from '@zitadel/proto/zitadel/webkey/v2beta/webkey_service_pb'; +} from '@zitadel/proto/zitadel/webkey/v2/webkey_service_pb'; @Injectable({ providedIn: 'root',