diff --git a/build/local/docker-compose-local.yml b/build/local/docker-compose-local.yml index 5d82220bb2..431d225676 100644 --- a/build/local/docker-compose-local.yml +++ b/build/local/docker-compose-local.yml @@ -6,7 +6,7 @@ services: restart: always networks: - zitadel - image: cockroachdb/cockroach:v21.2.4 + image: cockroachdb/cockroach:v21.2.5 command: start-single-node --insecure --listen-addr=0.0.0.0 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"] diff --git a/build/zitadel/Dockerfile b/build/zitadel/Dockerfile index faaf7937e6..ae436ff070 100644 --- a/build/zitadel/Dockerfile +++ b/build/zitadel/Dockerfile @@ -60,9 +60,9 @@ RUN apt install openssl tzdata tar # cockroach binary used to backup database RUN mkdir /usr/local/lib/cockroach -RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v21.2.4.linux-amd64.tgz \ - | tar xvz && cp -i cockroach-v21.2.4.linux-amd64/cockroach /usr/local/bin/ -RUN rm -r cockroach-v21.2.4.linux-amd64 +RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v21.2.5.linux-amd64.tgz \ + | tar xvz && cp -i cockroach-v21.2.5.linux-amd64/cockroach /usr/local/bin/ +RUN rm -r cockroach-v21.2.5.linux-amd64 ####################### ## generates static files diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.html b/console/src/app/modules/add-token-dialog/add-token-dialog.component.html new file mode 100644 index 0000000000..7ec9d30f2f --- /dev/null +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.html @@ -0,0 +1,25 @@ +{{'USER.PERSONALACCESSTOKEN.ADD.TITLE' | translate}} +
+ {{'USER.PERSONALACCESSTOKEN.ADD.DESCRIPTION' | translate}} + + + {{'USER.PERSONALACCESSTOKEN.ADD.CHOOSEEXPIRY' | translate}} (optional) + + + + + {{'USER.PERSONALACCESSTOKEN.ADD.CHOOSEDATEAFTER' | translate}}: + {{dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM'}} + + +
+
+ + + +
\ No newline at end of file diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss b/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss new file mode 100644 index 0000000000..907483cd93 --- /dev/null +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss @@ -0,0 +1,17 @@ +.title { + font-size: 1.2rem; + margin-top: 0; +} + +.form-field { + width: 100%; +} + +.action { + display: flex; + justify-content: flex-end; + + .ok-button { + margin-left: 0.5rem; + } +} diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.spec.ts b/console/src/app/modules/add-token-dialog/add-token-dialog.component.spec.ts new file mode 100644 index 0000000000..7eb83c6fff --- /dev/null +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddTokenDialogComponent } from './add-token-dialog.component'; + +describe('AddTokenDialogComponent', () => { + let component: AddTokenDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AddTokenDialogComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AddTokenDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.ts b/console/src/app/modules/add-token-dialog/add-token-dialog.component.ts new file mode 100644 index 0000000000..40fbf4a02d --- /dev/null +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.ts @@ -0,0 +1,26 @@ +import { Component, Inject } from '@angular/core'; +import { FormControl } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; + +@Component({ + selector: 'cnsl-add-token-dialog', + templateUrl: './add-token-dialog.component.html', + styleUrls: ['./add-token-dialog.component.scss'], +}) +export class AddTokenDialogComponent { + public startDate: Date = new Date(); + public dateControl: FormControl = new FormControl('', []); + + constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { + const today = new Date(); + this.startDate.setDate(today.getDate() + 1); + } + + public closeDialog(): void { + this.dialogRef.close(false); + } + + public closeDialogWithSuccess(): void { + this.dialogRef.close({ date: this.dateControl.value }); + } +} diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.module.ts b/console/src/app/modules/add-token-dialog/add-token-dialog.module.ts new file mode 100644 index 0000000000..e1699cd356 --- /dev/null +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.module.ts @@ -0,0 +1,33 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatMomentDateModule } from '@angular/material-moment-adapter'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatSelectModule } from '@angular/material/select'; +import { TranslateModule } from '@ngx-translate/core'; +import { InputModule } from 'src/app/modules/input/input.module'; +import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; + +import { InfoSectionModule } from '../info-section/info-section.module'; +import { AddTokenDialogComponent } from './add-token-dialog.component'; + +@NgModule({ + declarations: [AddTokenDialogComponent], + imports: [ + CommonModule, + TranslateModule, + MatButtonModule, + InfoSectionModule, + InputModule, + MatSelectModule, + MatIconModule, + FormsModule, + MatDatepickerModule, + MatMomentDateModule, + ReactiveFormsModule, + LocalizedDatePipeModule, + ], +}) +export class AddTokenDialogModule {} diff --git a/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.html b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.html new file mode 100644 index 0000000000..7d9b4c7b29 --- /dev/null +++ b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.html @@ -0,0 +1,65 @@ + +
+ + add{{ 'ACTIONS.NEW' | translate }} + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + {{ 'USER.PERSONALACCESSTOKEN.ID' | translate }} {{key?.id}} {{ 'USER.MACHINE.CREATIONDATE' | translate }} + {{key.details?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm'}} + {{ 'USER.MACHINE.EXPIRATIONDATE' | translate }} + {{key.expirationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm'}} + + +
+ +
+ \ No newline at end of file diff --git a/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.scss b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.scss new file mode 100644 index 0000000000..19b14b6a91 --- /dev/null +++ b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.scss @@ -0,0 +1,36 @@ +.table-wrapper { + overflow: auto; + + .table, + .paginator { + width: 100%; + + td, + th { + padding: 0 1rem; + + &:first-child { + padding-left: 0; + padding-right: 1rem; + } + + &:last-child { + padding-right: 0; + } + } + } +} + +tr { + outline: none; + + button { + visibility: hidden; + } + + &:hover { + button { + visibility: visible; + } + } +} diff --git a/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.spec.ts b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.spec.ts new file mode 100644 index 0000000000..3e2c3c5edb --- /dev/null +++ b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PersonalAccessTokensComponent } from './personal-access-tokens.component'; + +describe('PersonalAccessTokensComponent', () => { + let component: PersonalAccessTokensComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PersonalAccessTokensComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PersonalAccessTokensComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.ts b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.ts new file mode 100644 index 0000000000..e005caa280 --- /dev/null +++ b/console/src/app/modules/personal-access-tokens/personal-access-tokens.component.ts @@ -0,0 +1,163 @@ +import { SelectionModel } from '@angular/cdk/collections'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { MatTableDataSource } from '@angular/material/table'; +import { TranslateService } from '@ngx-translate/core'; +import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb'; +import { Moment } from 'moment'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { Key } from 'src/app/proto/generated/zitadel/auth_n_key_pb'; +import { ListPersonalAccessTokensResponse } from 'src/app/proto/generated/zitadel/management_pb'; +import { PersonalAccessToken } from 'src/app/proto/generated/zitadel/user_pb'; +import { ManagementService } from 'src/app/services/mgmt.service'; +import { ToastService } from 'src/app/services/toast.service'; + +import { AddTokenDialogComponent } from '../add-token-dialog/add-token-dialog.component'; +import { PageEvent, PaginatorComponent } from '../paginator/paginator.component'; +import { ShowTokenDialogComponent } from '../show-token-dialog/show-token-dialog.component'; +import { WarnDialogComponent } from '../warn-dialog/warn-dialog.component'; + +@Component({ + selector: 'cnsl-personal-access-tokens', + templateUrl: './personal-access-tokens.component.html', + styleUrls: ['./personal-access-tokens.component.scss'], +}) +export class PersonalAccessTokensComponent implements OnInit { + @Input() userId!: string; + + @ViewChild(PaginatorComponent) public paginator!: PaginatorComponent; + public dataSource: MatTableDataSource = + new MatTableDataSource(); + public selection: SelectionModel = new SelectionModel( + true, + [], + ); + public keyResult!: ListPersonalAccessTokensResponse.AsObject; + private loadingSubject: BehaviorSubject = new BehaviorSubject(false); + public loading$: Observable = this.loadingSubject.asObservable(); + @Input() public displayedColumns: string[] = ['select', 'id', 'creationDate', 'expirationDate', 'actions']; + + @Output() public changedSelection: EventEmitter> = new EventEmitter(); + + constructor( + public translate: TranslateService, + private mgmtService: ManagementService, + private dialog: MatDialog, + private toast: ToastService, + ) { + this.selection.changed.subscribe(() => { + this.changedSelection.emit(this.selection.selected); + }); + } + + public ngOnInit(): void { + this.getData(10, 0); + } + + public isAllSelected(): boolean { + const numSelected = this.selection.selected.length; + const numRows = this.dataSource.data.length; + return numSelected === numRows; + } + + public masterToggle(): void { + this.isAllSelected() ? this.selection.clear() : this.dataSource.data.forEach((row) => this.selection.select(row)); + } + + public changePage(event: PageEvent): void { + this.getData(event.pageSize, event.pageIndex * event.pageSize); + } + + public deleteKey(key: Key.AsObject): void { + const dialogRef = this.dialog.open(WarnDialogComponent, { + data: { + confirmKey: 'ACTIONS.DELETE', + cancelKey: 'ACTIONS.CANCEL', + titleKey: 'USER.PERSONALACCESSTOKEN.DELETE.TITLE', + descriptionKey: 'USER.PERSONALACCESSTOKEN.DELETE.DESCRIPTION', + }, + width: '400px', + }); + dialogRef.afterClosed().subscribe((resp) => { + if (resp) { + this.mgmtService + .removePersonalAccessToken(key.id, this.userId) + .then(() => { + this.selection.clear(); + this.toast.showInfo('USER.PERSONALACCESSTOKEN.DELETED', true); + this.getData(10, 0); + }) + .catch((error) => { + this.toast.showError(error); + }); + } + }); + } + + public openAddKey(): void { + const dialogRef = this.dialog.open(AddTokenDialogComponent, { + data: {}, + width: '400px', + }); + + dialogRef.afterClosed().subscribe((resp) => { + if (resp) { + let date: Timestamp | undefined; + + if (resp.date as Moment) { + const ts = new Timestamp(); + const milliseconds = resp.date.toDate().getTime(); + const seconds = Math.abs(milliseconds / 1000); + const nanos = (milliseconds - seconds * 1000) * 1000 * 1000; + ts.setSeconds(seconds); + ts.setNanos(nanos); + date = ts; + } + + this.mgmtService + .addPersonalAccessToken(this.userId, date) + .then((response) => { + if (response) { + setTimeout(() => { + this.refreshPage(); + }, 1000); + + this.dialog.open(ShowTokenDialogComponent, { + data: { + token: response, + }, + width: '400px', + }); + } + }) + .catch((error: any) => { + this.toast.showError(error); + }); + } + }); + } + + private async getData(limit: number, offset: number): Promise { + this.loadingSubject.next(true); + + if (this.userId) { + this.mgmtService + .listPersonalAccessTokens(this.userId, limit, offset) + .then((resp) => { + this.keyResult = resp; + if (resp.resultList) { + this.dataSource.data = resp.resultList; + } + this.loadingSubject.next(false); + }) + .catch((error: any) => { + this.toast.showError(error); + this.loadingSubject.next(false); + }); + } + } + + public refreshPage(): void { + this.getData(this.paginator.pageSize, this.paginator.pageIndex * this.paginator.pageSize); + } +} diff --git a/console/src/app/modules/personal-access-tokens/personal-access-tokens.module.ts b/console/src/app/modules/personal-access-tokens/personal-access-tokens.module.ts new file mode 100644 index 0000000000..d9b184bbdd --- /dev/null +++ b/console/src/app/modules/personal-access-tokens/personal-access-tokens.module.ts @@ -0,0 +1,55 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatTableModule } from '@angular/material/table'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { RouterModule } from '@angular/router'; +import { TranslateModule } from '@ngx-translate/core'; +import { HasRoleModule } from 'src/app/directives/has-role/has-role.module'; +import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module'; +import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; +import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module'; + +import { AddTokenDialogModule } from '../add-token-dialog/add-token-dialog.module'; +import { CardModule } from '../card/card.module'; +import { InputModule } from '../input/input.module'; +import { PaginatorModule } from '../paginator/paginator.module'; +import { RefreshTableModule } from '../refresh-table/refresh-table.module'; +import { ShowTokenDialogModule } from '../show-token-dialog/show-token-dialog.module'; +import { WarnDialogModule } from '../warn-dialog/warn-dialog.module'; +import { PersonalAccessTokensComponent } from './personal-access-tokens.component'; + +@NgModule({ + declarations: [PersonalAccessTokensComponent], + imports: [ + CommonModule, + RouterModule, + FormsModule, + MatButtonModule, + MatDialogModule, + HasRoleModule, + CardModule, + MatTableModule, + PaginatorModule, + MatIconModule, + MatProgressSpinnerModule, + MatCheckboxModule, + MatTooltipModule, + HasRolePipeModule, + TimestampToDatePipeModule, + LocalizedDatePipeModule, + TranslateModule, + RefreshTableModule, + InputModule, + ShowTokenDialogModule, + WarnDialogModule, + AddTokenDialogModule, + ], + exports: [PersonalAccessTokensComponent], +}) +export class PersonalAccessTokensModule {} diff --git a/console/src/app/modules/show-token-dialog/show-token-dialog.component.html b/console/src/app/modules/show-token-dialog/show-token-dialog.component.html new file mode 100644 index 0000000000..1c152541c8 --- /dev/null +++ b/console/src/app/modules/show-token-dialog/show-token-dialog.component.html @@ -0,0 +1,30 @@ +{{'USER.PERSONALACCESSTOKEN.ADDED.TITLE' | translate}} +
+ {{'USER.PERSONALACCESSTOKEN.ADDED.DESCRIPTION' | translate}} + + + +
+

{{'USER.PERSONALACCESSTOKEN.ID' | translate}}

+

{{tokenResponse.tokenId}}

+
+ +
+

{{'USER.PERSONALACCESSTOKEN.TOKEN' | translate}}

+
+ + {{tokenResponse.token}} +
+
+ +
+
+ +
\ No newline at end of file diff --git a/console/src/app/modules/show-token-dialog/show-token-dialog.component.scss b/console/src/app/modules/show-token-dialog/show-token-dialog.component.scss new file mode 100644 index 0000000000..92b2f5c7c1 --- /dev/null +++ b/console/src/app/modules/show-token-dialog/show-token-dialog.component.scss @@ -0,0 +1,48 @@ +.title { + font-size: 1.2rem; + margin-top: 0; +} + +.desc { + color: rgb(201, 51, 71); + font-size: 0.9rem; +} + +.action { + display: flex; + justify-content: flex-end; + + .ok-button { + margin-left: 0.5rem; + } +} + +.row { + display: flex; + width: 100%; + flex-direction: column; + + .left, + .right { + font-size: 14px; + } + + .left { + color: var(--grey); + margin-right: 1rem; + margin-top: 0; + margin-bottom: 0.5rem; + } + + .right { + margin-top: 0; + margin-bottom: 1rem; + overflow: auto; + display: flex; + align-items: center; + + .ctc { + margin-right: 1rem; + } + } +} diff --git a/console/src/app/modules/show-token-dialog/show-token-dialog.component.spec.ts b/console/src/app/modules/show-token-dialog/show-token-dialog.component.spec.ts new file mode 100644 index 0000000000..f788ccf4b4 --- /dev/null +++ b/console/src/app/modules/show-token-dialog/show-token-dialog.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; + +import { ShowKeyDialogComponent } from './show-key-dialog.component'; + +describe('ShowKeyDialogComponent', () => { + let component: ShowKeyDialogComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ShowKeyDialogComponent], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ShowKeyDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/console/src/app/modules/show-token-dialog/show-token-dialog.component.ts b/console/src/app/modules/show-token-dialog/show-token-dialog.component.ts new file mode 100644 index 0000000000..afff02fa2a --- /dev/null +++ b/console/src/app/modules/show-token-dialog/show-token-dialog.component.ts @@ -0,0 +1,24 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { AddPersonalAccessTokenResponse } from 'src/app/proto/generated/zitadel/management_pb'; + +import { InfoSectionType } from '../info-section/info-section.component'; + +@Component({ + selector: 'cnsl-show-token-dialog', + templateUrl: './show-token-dialog.component.html', + styleUrls: ['./show-token-dialog.component.scss'], +}) +export class ShowTokenDialogComponent { + public tokenResponse!: AddPersonalAccessTokenResponse.AsObject; + public copied: string = ''; + InfoSectionType: any = InfoSectionType; + + constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { + this.tokenResponse = data.token; + } + + public closeDialog(): void { + this.dialogRef.close(false); + } +} diff --git a/console/src/app/modules/show-token-dialog/show-token-dialog.module.ts b/console/src/app/modules/show-token-dialog/show-token-dialog.module.ts new file mode 100644 index 0000000000..f30ffd4bb0 --- /dev/null +++ b/console/src/app/modules/show-token-dialog/show-token-dialog.module.ts @@ -0,0 +1,26 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; +import { CopyToClipboardModule } from 'src/app/directives/copy-to-clipboard/copy-to-clipboard.module'; +import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; +import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module'; + +import { InfoSectionModule } from '../info-section/info-section.module'; +import { ShowTokenDialogComponent } from './show-token-dialog.component'; + +@NgModule({ + declarations: [ShowTokenDialogComponent], + imports: [ + CommonModule, + TranslateModule, + InfoSectionModule, + CopyToClipboardModule, + MatButtonModule, + MatTooltipModule, + LocalizedDatePipeModule, + TimestampToDatePipeModule, + ], +}) +export class ShowTokenDialogModule {} diff --git a/console/src/app/pages/users/user-detail/user-detail.module.ts b/console/src/app/pages/users/user-detail/user-detail.module.ts index 5bcc6a43ef..04e0009e9f 100644 --- a/console/src/app/pages/users/user-detail/user-detail.module.ts +++ b/console/src/app/pages/users/user-detail/user-detail.module.ts @@ -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, diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html index c12ae81a04..83654d21c8 100644 --- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html +++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html @@ -85,6 +85,11 @@ description="{{ 'USER.MACHINE.KEYSDESC' | translate }}"> + + + + diff --git a/console/src/app/services/mgmt.service.ts b/console/src/app/services/mgmt.service.ts index 4e9e2ce470..c802c36f2b 100644 --- a/console/src/app/services/mgmt.service.ts +++ b/console/src/app/services/mgmt.service.ts @@ -50,6 +50,8 @@ import { AddOrgOIDCIDPResponse, AddOrgRequest, AddOrgResponse, + AddPersonalAccessTokenRequest, + AddPersonalAccessTokenResponse, AddProjectGrantMemberRequest, AddProjectGrantMemberResponse, AddProjectGrantRequest, @@ -214,6 +216,8 @@ import { ListOrgMemberRolesResponse, ListOrgMembersRequest, ListOrgMembersResponse, + ListPersonalAccessTokensRequest, + ListPersonalAccessTokensResponse, ListProjectChangesRequest, ListProjectChangesResponse, ListProjectGrantMemberRolesRequest, @@ -294,6 +298,8 @@ import { RemoveOrgIDPResponse, RemoveOrgMemberRequest, RemoveOrgMemberResponse, + RemovePersonalAccessTokenRequest, + RemovePersonalAccessTokenResponse, RemoveProjectGrantMemberRequest, RemoveProjectGrantMemberResponse, RemoveProjectGrantRequest, @@ -984,6 +990,44 @@ export class ManagementService { return this.grpcService.mgmt.setTriggerActions(req, null).then((resp) => resp.toObject()); } + public addPersonalAccessToken(userId: string, date?: Timestamp): Promise { + const req = new AddPersonalAccessTokenRequest(); + req.setUserId(userId); + if (date) { + req.setExpirationDate(date); + } + return this.grpcService.mgmt.addPersonalAccessToken(req, null).then((resp) => resp.toObject()); + } + + public removePersonalAccessToken(tokenId: string, userId: string): Promise { + const req = new RemovePersonalAccessTokenRequest(); + req.setTokenId(tokenId); + req.setUserId(userId); + return this.grpcService.mgmt.removePersonalAccessToken(req, null).then((resp) => resp.toObject()); + } + + public listPersonalAccessTokens( + userId: string, + limit?: number, + offset?: number, + asc?: boolean, + ): Promise { + const req = new ListPersonalAccessTokensRequest(); + const metadata = new ListQuery(); + req.setUserId(userId); + if (limit) { + metadata.setLimit(limit); + } + if (offset) { + metadata.setOffset(offset); + } + if (asc) { + metadata.setAsc(asc); + } + req.setQuery(metadata); + return this.grpcService.mgmt.listPersonalAccessTokens(req, null).then((resp) => resp.toObject()); + } + public getIAM(): Promise { const req = new GetIAMRequest(); return this.grpcService.mgmt.getIAM(req, null).then((resp) => resp.toObject()); diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index 51e1dcc26d..c751dc34a5 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -378,6 +378,8 @@ "DESCRIPTION": "Beschreibung", "KEYSTITLE": "Schlüssel", "KEYSDESC": "Definiere Deine Schlüssel mit einem optionalen Ablaufdatum.", + "TOKENSTITLE": "Access Tokens", + "TOKENSDESC": "Diese Access Tokens funktionieren wie gewöhnliche OAuth Access Tokens.", "ID": "Schlüssel-ID", "TYPE": "Typ", "EXPIRATIONDATE": "Ablaufdatum", @@ -533,6 +535,25 @@ "PROJECT": "Projekt", "GRANTEDPROJECT": "Berechtigtes Projekt" } + }, + "PERSONALACCESSTOKEN": { + "ID": "ID", + "TOKEN": "Token", + "ADD": { + "TITLE": "Personal Access Token generieren", + "DESCRIPTION": "Definieren Sie das Ablaufdatum für das zu erstellende Token", + "CHOOSEEXPIRY": "Ablaufdatum", + "CHOOSEDATEAFTER": "Geben Sie ein valides Ablaufdatum an. Ab" + }, + "ADDED": { + "TITLE": "Personal Access Token", + "DESCRIPTION": "Kopieren Sie Ihr Access Token. Sie werden später nicht mehr darauf zugreifen können." + }, + "DELETE": { + "TITLE": "Token löschen", + "DESCRIPTION": "Sie sind im Begriff das Token unwiederruflich zu löschen. Wollen Sie dies wirklich tun?" + }, + "DELETED": "Personal Access Token gelöscht." } }, "FLOWS": { diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index c669af9d93..4aad40dfc6 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -378,6 +378,8 @@ "DESCRIPTION": "Description", "KEYSTITLE": "Keys", "KEYSDESC": "Define your keys and add an optional expiration date.", + "TOKENSTITLE": "Access Tokens", + "TOKENSDESC": "Personal access tokens function like ordinary OAuth access tokens.", "ID": "Key ID", "TYPE": "Type", "EXPIRATIONDATE": "Expiration date", @@ -533,6 +535,25 @@ "PROJECT": "Project", "GRANTEDPROJECT": "Granted Project" } + }, + "PERSONALACCESSTOKEN": { + "ID": "ID", + "TOKEN": "Token", + "ADD": { + "TITLE": "Generate new Personal Access Token", + "DESCRIPTION": "Define a custom expiration for the token.", + "CHOOSEEXPIRY": "Select an expiration date", + "CHOOSEDATEAFTER": "Enter a valid expiration after" + }, + "ADDED": { + "TITLE": "Personal Access Token", + "DESCRIPTION": "Make sure to copy your personal access token. You won't be able to see it again!" + }, + "DELETE": { + "TITLE": "Delete Token", + "DESCRIPTION": "You are about to delete the personal access token. Are you sure?" + }, + "DELETED": "Token deleted with success." } }, "FLOWS": { diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index 20de03f602..74738375a1 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -378,6 +378,8 @@ "DESCRIPTION": "Descrizione", "KEYSTITLE": "Chiavi", "KEYSDESC": "Definisci le tue chiavi e aggiungi una data di scadenza opzionale.", + "TOKENSTITLE": "Access Tokens", + "TOKENSDESC": "Questi Token d'accesso personali funzionano come i Access Token per OAuth.", "ID": "ID chiave", "TYPE": "Tipo", "EXPIRATIONDATE": "Data di scadenza", @@ -533,6 +535,25 @@ "PROJECT": "Progetto", "GRANTEDPROJECT": "Progetto concesso" } + }, + "PERSONALACCESSTOKEN": { + "ID": "ID", + "TOKEN": "Token", + "ADD": { + "TITLE": "Genera un nuovo token", + "DESCRIPTION": "Definisci la data di scadenza del token", + "CHOOSEEXPIRY": "Seleziona una data di scadenza", + "CHOOSEDATEAFTER": "Inserisci una scadenza valida" + }, + "ADDED": { + "TITLE": "Personal Access Token", + "DESCRIPTION": "Copia il tuo token di accesso. Non sarà possibile recuperarlo in seguito." + }, + "DELETE": { + "TITLE": "Elimina Token", + "DESCRIPTION": "Stai per eliminare il token di accesso. Sei sicuro di voler continuare?" + }, + "DELETED": "Token eliminato con successo." } }, "FLOWS": { diff --git a/internal/api/grpc/user/machine_token.go b/internal/api/grpc/user/personal_access_token.go similarity index 85% rename from internal/api/grpc/user/machine_token.go rename to internal/api/grpc/user/personal_access_token.go index 2407ab520c..2e512aa4ca 100644 --- a/internal/api/grpc/user/machine_token.go +++ b/internal/api/grpc/user/personal_access_token.go @@ -18,7 +18,7 @@ func PersonalAccessTokensToPb(tokens []*query.PersonalAccessToken) []*user.Perso func PersonalAccessTokenToPb(token *query.PersonalAccessToken) *user.PersonalAccessToken { return &user.PersonalAccessToken{ Id: token.ID, - Details: object.ChangeToDetailsPb(token.Sequence, token.ChangeDate, token.ResourceOwner), + Details: object.ToViewDetailsPb(token.Sequence, token.CreationDate, token.ChangeDate, token.ResourceOwner), ExpirationDate: timestamppb.New(token.Expiration), Scopes: token.Scopes, } diff --git a/operator/common/images.go b/operator/common/images.go index eb05be73c5..f9acef3aa8 100644 --- a/operator/common/images.go +++ b/operator/common/images.go @@ -9,7 +9,7 @@ type dockerhubImage image type zitadelImage image const ( - CockroachImage dockerhubImage = "cockroachdb/cockroach:v21.2.4" + CockroachImage dockerhubImage = "cockroachdb/cockroach:v21.2.5" PostgresImage dockerhubImage = "postgres:9.6.17" FlywayImage dockerhubImage = "flyway/flyway:8.0.2" AlpineImage dockerhubImage = "alpine:3.11"