feat(server,web): add force delete to immediately remove user (#7681)

* feat(server,web): add force delete to immediately remove user

* update wording on force delete confirmation

* fix force delete css

* PR feedback

* cleanup user service delete for force

* adding user status column

* some cleanup and tests

* more test fixes

* run npm run sql:generate

* chore: cleanup and websocket

* chore: linting

* userRepository.restore

* removed bad color class from delete-confirm-dialoge

* additional confirmation for user force delete

* shorten confirmation message

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>

mobile/openapi/lib/api.dart

@@ -99,6 +99,7 @@ part 'model/create_tag_dto.dart';
 part 'model/create_user_dto.dart';
 part 'model/curated_locations_response_dto.dart';
 part 'model/curated_objects_response_dto.dart';
+part 'model/delete_user_dto.dart';
 part 'model/download_archive_info.dart';
 part 'model/download_info_dto.dart';
 part 'model/download_response_dto.dart';
@@ -211,6 +212,7 @@ part 'model/usage_by_user_dto.dart';
 part 'model/user_avatar_color.dart';
 part 'model/user_dto.dart';
 part 'model/user_response_dto.dart';
+part 'model/user_status.dart';
 part 'model/validate_access_token_response_dto.dart';
 part 'model/validate_library_dto.dart';
 part 'model/validate_library_import_path_response_dto.dart';

mobile/openapi/lib/api/user_api.dart

@@ -157,19 +157,21 @@ class UserApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> deleteUserWithHttpInfo(String id,) async {
+  ///
+  /// * [DeleteUserDto] deleteUserDto (required):
+  Future<Response> deleteUserWithHttpInfo(String id, DeleteUserDto deleteUserDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/user/{id}'
       .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
-    Object? postBody;
+    Object? postBody = deleteUserDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    const contentTypes = <String>[];
+    const contentTypes = <String>['application/json'];
 
 
     return apiClient.invokeAPI(
@@ -186,8 +188,10 @@ class UserApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<UserResponseDto?> deleteUser(String id,) async {
-    final response = await deleteUserWithHttpInfo(id,);
+  ///
+  /// * [DeleteUserDto] deleteUserDto (required):
+  Future<UserResponseDto?> deleteUser(String id, DeleteUserDto deleteUserDto,) async {
+    final response = await deleteUserWithHttpInfo(id, deleteUserDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api_client.dart

@@ -280,6 +280,8 @@ class ApiClient {
           return CuratedLocationsResponseDto.fromJson(value);
         case 'CuratedObjectsResponseDto':
           return CuratedObjectsResponseDto.fromJson(value);
+        case 'DeleteUserDto':
+          return DeleteUserDto.fromJson(value);
         case 'DownloadArchiveInfo':
           return DownloadArchiveInfo.fromJson(value);
         case 'DownloadInfoDto':
@@ -504,6 +506,8 @@ class ApiClient {
           return UserDto.fromJson(value);
         case 'UserResponseDto':
           return UserResponseDto.fromJson(value);
+        case 'UserStatus':
+          return UserStatusTypeTransformer().decode(value);
         case 'ValidateAccessTokenResponseDto':
           return ValidateAccessTokenResponseDto.fromJson(value);
         case 'ValidateLibraryDto':

mobile/openapi/lib/api_helper.dart

@@ -136,6 +136,9 @@ String parameterToString(dynamic value) {
   if (value is UserAvatarColor) {
     return UserAvatarColorTypeTransformer().encode(value).toString();
   }
+  if (value is UserStatus) {
+    return UserStatusTypeTransformer().encode(value).toString();
+  }
   if (value is VideoCodec) {
     return VideoCodecTypeTransformer().encode(value).toString();
   }

mobile/openapi/lib/model/delete_user_dto.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.12
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class DeleteUserDto {
+  /// Returns a new [DeleteUserDto] instance.
+  DeleteUserDto({
+    this.force,
+  });
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? force;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is DeleteUserDto &&
+    other.force == force;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (force == null ? 0 : force!.hashCode);
+
+  @override
+  String toString() => 'DeleteUserDto[force=$force]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.force != null) {
+      json[r'force'] = this.force;
+    } else {
+    //  json[r'force'] = null;
+    }
+    return json;
+  }
+
+  /// Returns a new [DeleteUserDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static DeleteUserDto? fromJson(dynamic value) {
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return DeleteUserDto(
+        force: mapValueOfType<bool>(json, r'force'),
+      );
+    }
+    return null;
+  }
+
+  static List<DeleteUserDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <DeleteUserDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = DeleteUserDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, DeleteUserDto> mapFromJson(dynamic json) {
+    final map = <String, DeleteUserDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = DeleteUserDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of DeleteUserDto-objects as value to a dart map
+  static Map<String, List<DeleteUserDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<DeleteUserDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = DeleteUserDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+  };
+}
+

mobile/openapi/lib/model/partner_response_dto.dart

@@ -27,6 +27,7 @@ class PartnerResponseDto {
     required this.quotaSizeInBytes,
     required this.quotaUsageInBytes,
     required this.shouldChangePassword,
+    required this.status,
     required this.storageLabel,
     required this.updatedAt,
   });
@@ -71,6 +72,8 @@ class PartnerResponseDto {
 
   bool shouldChangePassword;
 
+  UserStatus status;
+
   String? storageLabel;
 
   DateTime updatedAt;
@@ -91,6 +94,7 @@ class PartnerResponseDto {
     other.quotaSizeInBytes == quotaSizeInBytes &&
     other.quotaUsageInBytes == quotaUsageInBytes &&
     other.shouldChangePassword == shouldChangePassword &&
+    other.status == status &&
     other.storageLabel == storageLabel &&
     other.updatedAt == updatedAt;
 
@@ -111,11 +115,12 @@ class PartnerResponseDto {
     (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
     (quotaUsageInBytes == null ? 0 : quotaUsageInBytes!.hashCode) +
     (shouldChangePassword.hashCode) +
+    (status.hashCode) +
     (storageLabel == null ? 0 : storageLabel!.hashCode) +
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, status=$status, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -153,6 +158,7 @@ class PartnerResponseDto {
     //  json[r'quotaUsageInBytes'] = null;
     }
       json[r'shouldChangePassword'] = this.shouldChangePassword;
+      json[r'status'] = this.status;
     if (this.storageLabel != null) {
       json[r'storageLabel'] = this.storageLabel;
     } else {
@@ -184,6 +190,7 @@ class PartnerResponseDto {
         quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
         quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes'),
         shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!,
+        status: UserStatus.fromJson(json[r'status'])!,
         storageLabel: mapValueOfType<String>(json, r'storageLabel'),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
@@ -245,6 +252,7 @@ class PartnerResponseDto {
     'quotaSizeInBytes',
     'quotaUsageInBytes',
     'shouldChangePassword',
+    'status',
     'storageLabel',
     'updatedAt',
   };

mobile/openapi/lib/model/user_response_dto.dart

@@ -26,6 +26,7 @@ class UserResponseDto {
     required this.quotaSizeInBytes,
     required this.quotaUsageInBytes,
     required this.shouldChangePassword,
+    required this.status,
     required this.storageLabel,
     required this.updatedAt,
   });
@@ -62,6 +63,8 @@ class UserResponseDto {
 
   bool shouldChangePassword;
 
+  UserStatus status;
+
   String? storageLabel;
 
   DateTime updatedAt;
@@ -81,6 +84,7 @@ class UserResponseDto {
     other.quotaSizeInBytes == quotaSizeInBytes &&
     other.quotaUsageInBytes == quotaUsageInBytes &&
     other.shouldChangePassword == shouldChangePassword &&
+    other.status == status &&
     other.storageLabel == storageLabel &&
     other.updatedAt == updatedAt;
 
@@ -100,11 +104,12 @@ class UserResponseDto {
     (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
     (quotaUsageInBytes == null ? 0 : quotaUsageInBytes!.hashCode) +
     (shouldChangePassword.hashCode) +
+    (status.hashCode) +
     (storageLabel == null ? 0 : storageLabel!.hashCode) +
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, status=$status, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -137,6 +142,7 @@ class UserResponseDto {
     //  json[r'quotaUsageInBytes'] = null;
     }
       json[r'shouldChangePassword'] = this.shouldChangePassword;
+      json[r'status'] = this.status;
     if (this.storageLabel != null) {
       json[r'storageLabel'] = this.storageLabel;
     } else {
@@ -167,6 +173,7 @@ class UserResponseDto {
         quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
         quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes'),
         shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!,
+        status: UserStatus.fromJson(json[r'status'])!,
         storageLabel: mapValueOfType<String>(json, r'storageLabel'),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
@@ -228,6 +235,7 @@ class UserResponseDto {
     'quotaSizeInBytes',
     'quotaUsageInBytes',
     'shouldChangePassword',
+    'status',
     'storageLabel',
     'updatedAt',
   };

mobile/openapi/lib/model/user_status.dart

@@ -0,0 +1,88 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.12
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+
+class UserStatus {
+  /// Instantiate a new enum with the provided [value].
+  const UserStatus._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const active = UserStatus._(r'active');
+  static const removing = UserStatus._(r'removing');
+  static const deleted = UserStatus._(r'deleted');
+
+  /// List of all possible values in this [enum][UserStatus].
+  static const values = <UserStatus>[
+    active,
+    removing,
+    deleted,
+  ];
+
+  static UserStatus? fromJson(dynamic value) => UserStatusTypeTransformer().decode(value);
+
+  static List<UserStatus> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <UserStatus>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = UserStatus.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [UserStatus] to String,
+/// and [decode] dynamic data back to [UserStatus].
+class UserStatusTypeTransformer {
+  factory UserStatusTypeTransformer() => _instance ??= const UserStatusTypeTransformer._();
+
+  const UserStatusTypeTransformer._();
+
+  String encode(UserStatus data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a UserStatus.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  UserStatus? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'active': return UserStatus.active;
+        case r'removing': return UserStatus.removing;
+        case r'deleted': return UserStatus.deleted;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [UserStatusTypeTransformer] instance.
+  static UserStatusTypeTransformer? _instance;
+}
+