mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-17 02:55:11 +00:00
+6








07ce3b6905
This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <[email protected]> Co-authored-by: Stefan Benz <[email protected]> Co-authored-by: Silvan <[email protected]> Co-authored-by: Ramon <[email protected]> Co-authored-by: Elio Bischof <[email protected]> Co-authored-by: Kenta Yamaguchi <[email protected]> Co-authored-by: Harsha Reddy <[email protected]> Co-authored-by: Livio Spring <[email protected]> Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Iraq <[email protected]> Co-authored-by: Florian Forster <[email protected]> Co-authored-by: Tim Möhlmann <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Max Peintner <[email protected]>
218 lines
7.1 KiB
TypeScript
218 lines
7.1 KiB
TypeScript
import { ChangeDetectionStrategy, Component, DestroyRef, OnInit, signal } from '@angular/core';
|
|
import { WebKeysService } from 'src/app/services/webkeys.service';
|
|
import { defer, EMPTY, firstValueFrom, Observable, ObservedValueOf, of, shareReplay, Subject, switchMap } from 'rxjs';
|
|
import { catchError, map, startWith, withLatestFrom } from 'rxjs/operators';
|
|
import { ToastService } from 'src/app/services/toast.service';
|
|
import { MessageInitShape } from '@bufbuild/protobuf';
|
|
import { OidcWebKeysCreateComponent } from './oidc-webkeys-create/oidc-webkeys-create.component';
|
|
import { TimestampToDatePipe } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date.pipe';
|
|
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 { NewFeatureService } from 'src/app/services/new-feature.service';
|
|
import { ActivatedRoute, Router } from '@angular/router';
|
|
|
|
const CACHE_WARNING_MS = 5 * 60 * 1000; // 5 minutes
|
|
|
|
@Component({
|
|
selector: 'cnsl-oidc-webkeys',
|
|
templateUrl: './oidc-webkeys.component.html',
|
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
})
|
|
export class OidcWebKeysComponent implements OnInit {
|
|
protected readonly refresh = new Subject<true>();
|
|
protected readonly webKeysEnabled$: Observable<boolean>;
|
|
protected readonly webKeys$: Observable<WebKey[]>;
|
|
protected readonly inactiveWebKeys$: Observable<WebKey[]>;
|
|
protected readonly nextWebKeyCandidate$: Observable<WebKey | undefined>;
|
|
|
|
protected readonly activateLoading = signal(false);
|
|
protected readonly createLoading = signal(false);
|
|
|
|
constructor(
|
|
private readonly webKeysService: WebKeysService,
|
|
private readonly featureService: NewFeatureService,
|
|
private readonly toast: ToastService,
|
|
private readonly timestampToDatePipe: TimestampToDatePipe,
|
|
private readonly dialog: MatDialog,
|
|
private readonly destroyRef: DestroyRef,
|
|
private readonly router: Router,
|
|
private readonly route: ActivatedRoute,
|
|
) {
|
|
this.webKeysEnabled$ = this.getWebKeysEnabled().pipe(shareReplay({ refCount: true, bufferSize: 1 }));
|
|
|
|
const webKeys$ = this.getWebKeys(this.webKeysEnabled$).pipe(shareReplay({ refCount: true, bufferSize: 1 }));
|
|
|
|
this.webKeys$ = webKeys$.pipe(map((webKeys) => webKeys.filter((webKey) => webKey.state !== State.INACTIVE)));
|
|
this.inactiveWebKeys$ = webKeys$.pipe(map((webKeys) => webKeys.filter((webKey) => webKey.state === State.INACTIVE)));
|
|
|
|
this.nextWebKeyCandidate$ = this.getNextWebKeyCandidate(this.webKeys$);
|
|
}
|
|
|
|
ngOnInit(): void {
|
|
// redirect away from this page if web keys are not enabled
|
|
// this also preloads the web keys enabled state
|
|
this.webKeysEnabled$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async (webKeysEnabled) => {
|
|
if (webKeysEnabled) {
|
|
return;
|
|
}
|
|
await this.router.navigate([], {
|
|
relativeTo: this.route,
|
|
queryParamsHandling: 'merge',
|
|
queryParams: {
|
|
id: null,
|
|
},
|
|
});
|
|
});
|
|
}
|
|
|
|
private getWebKeysEnabled() {
|
|
return defer(() => this.featureService.getInstanceFeatures()).pipe(
|
|
map((features) => features.webKey?.enabled ?? false),
|
|
catchError((err) => {
|
|
this.toast.showError(err);
|
|
return of(false);
|
|
}),
|
|
);
|
|
}
|
|
|
|
private getWebKeys(webKeysEnabled$: Observable<boolean>) {
|
|
return this.refresh.pipe(
|
|
startWith(true),
|
|
switchMap(() => {
|
|
return this.webKeysService.ListWebKeys();
|
|
}),
|
|
map(({ webKeys }) => webKeys),
|
|
catchError(async (err) => {
|
|
const webKeysEnabled = await firstValueFrom(webKeysEnabled$);
|
|
// suppress errors if web keys are not enabled
|
|
if (!webKeysEnabled) {
|
|
return [];
|
|
}
|
|
|
|
this.toast.showError(err);
|
|
return [];
|
|
}),
|
|
);
|
|
}
|
|
|
|
private getNextWebKeyCandidate(webKeys$: Observable<WebKey[]>) {
|
|
return webKeys$.pipe(
|
|
map((webKeys) => {
|
|
if (webKeys.length < 2) {
|
|
return undefined;
|
|
}
|
|
const [webKey, nextWebKey] = webKeys;
|
|
if (webKey.state !== State.ACTIVE) {
|
|
return undefined;
|
|
}
|
|
if (nextWebKey.state !== State.INITIAL) {
|
|
return undefined;
|
|
}
|
|
return nextWebKey;
|
|
}),
|
|
);
|
|
}
|
|
|
|
protected async createWebKey(event: ObservedValueOf<OidcWebKeysCreateComponent['ngSubmit']>) {
|
|
try {
|
|
this.createLoading.set(true);
|
|
|
|
const req = !event
|
|
? this.createEd25519()
|
|
: 'curve' in event
|
|
? this.createEcdsa(event.curve)
|
|
: this.createRsa(event.bits, event.hasher);
|
|
await this.webKeysService.CreateWebKey(req);
|
|
|
|
this.refresh.next(true);
|
|
} catch (error) {
|
|
this.toast.showError(error);
|
|
} finally {
|
|
this.createLoading.set(false);
|
|
}
|
|
}
|
|
|
|
private createEd25519(): MessageInitShape<typeof CreateWebKeyRequestSchema> {
|
|
return {
|
|
key: {
|
|
case: 'ed25519',
|
|
value: {},
|
|
},
|
|
};
|
|
}
|
|
|
|
private createEcdsa(curve: ECDSACurve): MessageInitShape<typeof CreateWebKeyRequestSchema> {
|
|
return {
|
|
key: {
|
|
case: 'ecdsa',
|
|
value: {
|
|
curve,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
private createRsa(bits: RSABits, hasher: RSAHasher): MessageInitShape<typeof CreateWebKeyRequestSchema> {
|
|
return {
|
|
key: {
|
|
case: 'rsa',
|
|
value: {
|
|
bits,
|
|
hasher,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
protected async deleteWebKey(row: WebKey) {
|
|
try {
|
|
await this.webKeysService.DeleteWebKey(row.id);
|
|
this.refresh.next(true);
|
|
} catch (err) {
|
|
this.toast.showError(err);
|
|
}
|
|
}
|
|
|
|
protected async activateWebKey(nextWebKey: WebKey) {
|
|
try {
|
|
this.activateLoading.set(true);
|
|
const creationDate = this.timestampToDatePipe.transform(nextWebKey.creationDate);
|
|
if (!creationDate) {
|
|
// noinspection ExceptionCaughtLocallyJS
|
|
throw new Error('Invalid creation date');
|
|
}
|
|
|
|
const diffToCurrentTime = Date.now() - creationDate.getTime();
|
|
if (diffToCurrentTime < CACHE_WARNING_MS && !(await this.openCacheWarnDialog())) {
|
|
return;
|
|
}
|
|
|
|
await this.webKeysService.ActivateWebKey(nextWebKey.id);
|
|
this.refresh.next(true);
|
|
} catch (error) {
|
|
this.toast.showError(error);
|
|
} finally {
|
|
this.activateLoading.set(false);
|
|
}
|
|
}
|
|
|
|
private openCacheWarnDialog() {
|
|
const dialogRef = this.dialog.open(WarnDialogComponent, {
|
|
data: {
|
|
confirmKey: 'DESCRIPTIONS.SETTINGS.WEB_KEYS.TABLE.ACTIVATE',
|
|
cancelKey: 'ACTIONS.CANCEL',
|
|
titleKey: 'Web Key is less then 5 min old',
|
|
descriptionKey: 'DESCRIPTIONS.SETTINGS.WEB_KEYS.TABLE.NOTE',
|
|
},
|
|
width: '400px',
|
|
});
|
|
|
|
const obs = dialogRef.afterClosed().pipe(map(Boolean), takeUntilDestroyed(this.destroyRef));
|
|
return firstValueFrom(obs);
|
|
}
|
|
}
|