feat: merge main into v2 (#3193)

* feat(console): personal access tokens (#3185)

* token dialog, pat module

* pat components

* i18n, warn dialog, add token dialog

* cleanup dialog

* clipboard

* return creationDate of pat

* i18n

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* fix(cockroach): update to 21.2.5 (#3189)

Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Livio Amstutz
2022-02-11 13:33:31 +01:00
committed by GitHub
parent b44b48fa1e
commit 5d4351f47c
25 changed files with 745 additions and 6 deletions

View File

@@ -25,8 +25,10 @@ import { MachineKeysModule } from 'src/app/modules/machine-keys/machine-keys.mod
import { MetaLayoutModule } from 'src/app/modules/meta-layout/meta-layout.module';
import { PaginatorModule } from 'src/app/modules/paginator/paginator.module';
import { PasswordComplexityViewModule } from 'src/app/modules/password-complexity-view/password-complexity-view.module';
import { PersonalAccessTokensModule } from 'src/app/modules/personal-access-tokens/personal-access-tokens.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { ShowTokenDialogModule } from 'src/app/modules/show-token-dialog/show-token-dialog.module';
import { UserGrantsModule } from 'src/app/modules/user-grants/user-grants.module';
import { WarnDialogModule } from 'src/app/modules/warn-dialog/warn-dialog.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
@@ -94,11 +96,13 @@ import { UserMfaComponent } from './user-detail/user-mfa/user-mfa.component';
WarnDialogModule,
MatDialogModule,
QrCodeModule,
ShowTokenDialogModule,
MetaLayoutModule,
MatCheckboxModule,
HasRolePipeModule,
UserGrantsModule,
MatButtonModule,
PersonalAccessTokensModule,
MatIconModule,
CardModule,
MatProgressSpinnerModule,

View File

@@ -85,6 +85,11 @@
description="{{ 'USER.MACHINE.KEYSDESC' | translate }}">
<cnsl-machine-keys [userId]="user.id"></cnsl-machine-keys>
</cnsl-card>
<cnsl-card *ngIf="user.machine && user.id" title="{{ 'USER.MACHINE.TOKENSTITLE' | translate }}"
description="{{ 'USER.MACHINE.TOKENSDESC' | translate }}">
<cnsl-personal-access-tokens [userId]="user.id"></cnsl-personal-access-tokens>
</cnsl-card>
</ng-template>
<cnsl-passwordless *ngIf="user && user.human" [user]="user" [disabled]="(canWrite$ | async) === false">