feat(admin): allow deletion of users according to config property

* There is new config property 'user_deletion_forced' which defines if users on instance can be deleted or anonymized (this is the default option).
* This task is related to new backend implementation where deletion of user is now connected with blocking of user's logins.
* The new configuration property 'user_deletion_forced' (default false) was added. When this property is not set, still the default anonymization will be applied.

BREAKING-CHANGE: new configuration property 'user_deletion_forced'

Author: HejdaJakub

apps/admin-gui/src/app/admin/pages/admin-user-detail-page/admin-user-detail-page.component.html

@@ -22,9 +22,15 @@
             data-cy="edit-user-button">
             <mat-icon>edit</mat-icon>
           </button>
-          <button *ngIf="!anonymized" (click)="anonymizeUser()" mat-icon-button>
+          <button
+            *ngIf="!anonymized && !userDeletionForced"
+            (click)="anonymizeUser()"
+            mat-icon-button>
             <mat-icon>no_accounts</mat-icon>
           </button>
+          <button *ngIf="userDeletionForced" (click)="deleteUser()" mat-icon-button>
+            <mat-icon>delete_forever</mat-icon>
+          </button>
           <mat-icon
             *ngIf="anonymized"
             matTooltip="{{'USER_DETAIL.DASHBOARD.ANONYMIZED' | translate}}"

apps/admin-gui/src/app/admin/pages/admin-user-detail-page/admin-user-detail-page.component.ts

@@ -6,8 +6,16 @@ import { AttributesManagerService, User, UsersManagerService } from '@perun-web-
 import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
 import { MatDialog } from '@angular/material/dialog';
 import { EditUserDialogComponent } from '../../../shared/components/dialogs/edit-user-dialog/edit-user-dialog.component';
-import { EntityStorageService, GuiAuthResolver } from '@perun-web-apps/perun/services';
-import { AnonymizeUserDialogComponent } from '@perun-web-apps/perun/dialogs';
+import {
+  EntityStorageService,
+  GuiAuthResolver,
+  StoreService,
+} from '@perun-web-apps/perun/services';
+import {
+  AnonymizeUserDialogComponent,
+  DeleteUserDialogComponent,
+} from '@perun-web-apps/perun/dialogs';
+import { ComponentType } from '@angular/cdk/overlay';
 
 @Component({
   selector: 'app-admin-user-detail-page',
@@ -19,6 +27,7 @@ export class AdminUserDetailPageComponent implements OnInit {
   loading = false;
   svgIcon = 'perun-user-dark';
   anonymized: boolean;
+  userDeletionForced: boolean;
   private path: string;
   private regex: string;
 
@@ -31,11 +40,13 @@ export class AdminUserDetailPageComponent implements OnInit {
     private dialog: MatDialog,
     public authResolver: GuiAuthResolver,
     private entityStorageService: EntityStorageService,
-    private router: Router
+    private router: Router,
+    private store: StoreService
   ) {}
 
   ngOnInit(): void {
     this.loading = true;
+    this.userDeletionForced = this.store.getProperty('user_deletion_forced');
     this.route.params.subscribe((params) => {
       const userId = Number(params['userId']);
       this.entityStorageService.setEntity({ id: Number(userId), beanName: 'User' });
@@ -91,14 +102,23 @@ export class AdminUserDetailPageComponent implements OnInit {
   }
 
   anonymizeUser(): void {
+    this.openDialog(AnonymizeUserDialogComponent);
+  }
+
+  deleteUser(): void {
+    this.openDialog(DeleteUserDialogComponent);
+  }
+
+  private openDialog(
+    dialogComponent: ComponentType<AnonymizeUserDialogComponent | DeleteUserDialogComponent>
+  ): void {
     const config = getDefaultDialogConfig();
     config.width = '550px';
     config.data = {
       theme: 'admin-theme',
       user: this.user,
     };
-
-    const dialogRef = this.dialog.open(AnonymizeUserDialogComponent, config);
+    const dialogRef = this.dialog.open(dialogComponent, config);
 
     dialogRef.afterClosed().subscribe((result) => {
       if (result) {

apps/admin-gui/src/assets/config/defaultConfig.json

@@ -55,6 +55,7 @@
   },
   "group_name_secondary_regex": "^[-a-zA-Z.0-9_ ]+$",
   "group_name_error_message": "Name cannot be empty and can contain only characters a-z, A-Z, numbers, spaces, dots, '_' and '-'",
+  "user_deletion_forced": false,
   "enforce_consents": false,
   "footer": {
     "columns": [

apps/admin-gui/src/assets/i18n/en.json

@@ -2208,6 +2208,11 @@
       "GROUP_RELATION": "User's membership in all groups",
       "SUCCESS_NOTIFICATION": "User was successfully anonymized"
     },
+    "DELETE_USER": {
+      "VO_RELATION": "User's membership in all organizations",
+      "GROUP_RELATION": "User's membership in all groups",
+      "SUCCESS_NOTIFICATION": "User was successfully deleted"
+    },
     "CHANGE_VO_EXPIRATION": {
       "TITLE": "Change member expiration"
     },

libs/perun/dialogs/src/index.ts

@@ -27,3 +27,4 @@ export * from './lib/add-ssh-dialog/add-ssh-dialog.component';
 export * from './lib/remove-string-value-dialog/remove-string-value-dialog.component';
 export * from './lib/show-ssh-dialog/show-ssh-dialog.component';
 export * from './lib/show-notification-history-dialog/show-notification-history-dialog.component';
+export * from './lib/delete-user-dialog/delete-user-dialog.component';

libs/perun/dialogs/src/lib/anonymize-user-dialog/anonymize-user-dialog.component.ts

@@ -2,8 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { User, UsersManagerService } from '@perun-web-apps/perun/openapi';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { NotificatorService } from '@perun-web-apps/perun/services';
-import { TranslateService } from '@ngx-translate/core';
+import { NotificatorService, PerunTranslateService } from '@perun-web-apps/perun/services';
 import { DeleteDialogResult } from '../delete-entity-dialog/delete-entity-dialog.component';
 
 export interface AnonymizeUserDialogComponentData {
@@ -29,14 +28,14 @@ export class AnonymizeUserDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) private data: AnonymizeUserDialogComponentData,
     private notificator: NotificatorService,
     private usersService: UsersManagerService,
-    private translate: TranslateService
+    private translate: PerunTranslateService
   ) {}
 
   ngOnInit(): void {
     this.theme = this.data.theme;
     this.dataSource = new MatTableDataSource<User>([this.data.user]);
-    this.relations.push(this.translate.instant('DIALOGS.ANONYMIZE_USER.GROUP_RELATION') as string);
-    this.relations.push(this.translate.instant('DIALOGS.ANONYMIZE_USER.VO_RELATION') as string);
+    this.relations.push(this.translate.instant('DIALOGS.ANONYMIZE_USER.GROUP_RELATION'));
+    this.relations.push(this.translate.instant('DIALOGS.ANONYMIZE_USER.VO_RELATION'));
   }
 
   onCancel(): void {
@@ -45,16 +44,16 @@ export class AnonymizeUserDialogComponent implements OnInit {
 
   anonymizeUser(): void {
     this.loading = true;
-    this.usersService.anonymizeUser(this.data.user.id, this.force).subscribe(
-      () => {
+    this.usersService.anonymizeUser(this.data.user.id, this.force).subscribe({
+      next: () => {
         this.notificator.showSuccess(
-          this.translate.instant('DIALOGS.ANONYMIZE_USER.SUCCESS_NOTIFICATION') as string
+          this.translate.instant('DIALOGS.ANONYMIZE_USER.SUCCESS_NOTIFICATION')
         );
         this.loading = false;
         this.dialogRef.close(true);
       },
-      () => (this.loading = false)
-    );
+      error: () => (this.loading = false),
+    });
   }
 
   onSubmit(result: DeleteDialogResult): void {

libs/perun/dialogs/src/lib/delete-entity-dialog/delete-entity-dialog.component.html

@@ -26,7 +26,7 @@ <h1 mat-dialog-title>
           <ng-container matColumnDef="name">
             <th *matHeaderCellDef mat-header-cell></th>
             <td *matCellDef="let entity" mat-cell>
-              {{anonymize ? (entity | userFullName) : entity.name }}
+              {{ entityType === 'user' ? (entity | userFullName) : entity.name }}
             </td>
           </ng-container>
 
@@ -87,7 +87,7 @@ <h1 mat-dialog-title>
             <ng-container matColumnDef="name">
               <th *matHeaderCellDef mat-header-cell></th>
               <td *matCellDef="let entity" mat-cell>
-                {{anonymize ? (entity | userFullName) : entity.name }}
+                {{ entityType === 'user' ? (entity | userFullName) : entity.name }}
               </td>
             </ng-container>
 

libs/perun/dialogs/src/lib/delete-user-dialog/delete-user-dialog.component.html

@@ -0,0 +1,9 @@
+<div class="{{theme}}">
+  <perun-web-apps-delete-entity-dialog
+    [entityNames]="dataSource"
+    [entityType]="'user'"
+    [relations]="relations"
+    [loading]="loading"
+    (deleted)="onSubmit($event)">
+  </perun-web-apps-delete-entity-dialog>
+</div>

libs/perun/dialogs/src/lib/delete-user-dialog/delete-user-dialog.component.scss

@@ -0,0 +1,66 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatTableDataSource } from '@angular/material/table';
+import { User, UsersManagerService } from '@perun-web-apps/perun/openapi';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { NotificatorService, PerunTranslateService } from '@perun-web-apps/perun/services';
+import { DeleteDialogResult } from '../delete-entity-dialog/delete-entity-dialog.component';
+
+export interface DeleteUserDialogComponentData {
+  user: User;
+  theme: string;
+}
+
+@Component({
+  selector: 'perun-web-apps-delete-user-dialog',
+  templateUrl: './delete-user-dialog.component.html',
+  styleUrls: ['./delete-user-dialog.component.scss'],
+})
+export class DeleteUserDialogComponent implements OnInit {
+  theme: string;
+  force = false;
+  loading: boolean;
+  dataSource: MatTableDataSource<User>;
+  relations: string[] = [];
+
+  constructor(
+    private dialogRef: MatDialogRef<DeleteUserDialogComponentData>,
+    @Inject(MAT_DIALOG_DATA) private data: DeleteUserDialogComponentData,
+    private notificator: NotificatorService,
+    private usersService: UsersManagerService,
+    private translate: PerunTranslateService
+  ) {}
+
+  ngOnInit(): void {
+    this.theme = this.data.theme;
+    this.dataSource = new MatTableDataSource<User>([this.data.user]);
+    this.relations.push(this.translate.instant('DIALOGS.DELETE_USER.GROUP_RELATION'));
+    this.relations.push(this.translate.instant('DIALOGS.DELETE_USER.VO_RELATION'));
+  }
+
+  onCancel(): void {
+    this.dialogRef.close(false);
+  }
+
+  deleteUser(): void {
+    this.loading = true;
+    this.usersService.deleteUser(this.data.user.id, this.force).subscribe({
+      next: () => {
+        this.notificator.showSuccess(
+          this.translate.instant('DIALOGS.DELETE_USER.SUCCESS_NOTIFICATION')
+        );
+        this.loading = false;
+        this.dialogRef.close(true);
+      },
+      error: () => (this.loading = false),
+    });
+  }
+
+  onSubmit(result: DeleteDialogResult): void {
+    this.force = result.force;
+    if (result.deleted) {
+      this.deleteUser();
+    } else {
+      this.onCancel();
+    }
+  }
+}

libs/perun/dialogs/src/lib/delete-user-dialog/delete-user-dialog.component.ts

@@ -47,6 +47,7 @@ import { UiMaterialModule } from '@perun-web-apps/ui/material';
 import { ExportDataDialogComponent } from './exporting-data-dialog/export-data-dialog.component';
 import { RequestChangeDataQuotaDialogComponent } from './request-change-data-quota-dialog/request-change-data-quota-dialog.component';
 import { ExpirationSelectComponent } from './expiration-select/expiration-select.component';
+import { DeleteUserDialogComponent } from './delete-user-dialog/delete-user-dialog.component';
 
 @NgModule({
   imports: [
@@ -101,6 +102,7 @@ import { ExpirationSelectComponent } from './expiration-select/expiration-select
     ExportDataDialogComponent,
     RequestChangeDataQuotaDialogComponent,
     ExpirationSelectComponent,
+    DeleteUserDialogComponent,
   ],
   exports: [
     ChangeExpirationDialogComponent,
@@ -125,6 +127,7 @@ import { ExpirationSelectComponent } from './expiration-select/expiration-select
     ExportDataDialogComponent,
     RequestChangeDataQuotaDialogComponent,
     ExpirationSelectComponent,
+    DeleteUserDialogComponent,
   ],
 })
 export class PerunDialogsModule {}

libs/perun/dialogs/src/lib/perun-dialogs.module.ts

@@ -167,6 +167,7 @@ export interface PerunConfig {
   // Admin gui specific
   // Required
   config: string;
+  user_deletion_forced?: boolean;
   // Optional
   login_namespace_attributes?: string[];
   profile_label_en?: string;