High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): restore user (#15763)
Jason Rasmussena0aea021a104
diff --git a/e2e/src/api/specs/user-admin.e2e-spec.ts b/e2e/src/api/specs/user-admin.e2e-spec.tsindex 8a417387e7..9299e62b79 100644--- a/e2e/src/api/specs/user-admin.e2e-spec.ts+++ b/e2e/src/api/specs/user-admin.e2e-spec.ts@@ -356,5 +356,24 @@ describe('/admin/users', () => {expect(status).toBe(403);expect(body).toEqual(errorDto.forbidden);});++ it('should restore a user', async () => {+ const user = await utils.userSetup(admin.accessToken, createUserDto.create('restore'));++ await deleteUserAdmin({ id: user.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });++ const { status, body } = await request(app)+ .post(`/admin/users/${user.userId}/restore`)+ .set('Authorization', `Bearer ${admin.accessToken}`);+ expect(status).toBe(200);+ expect(body).toEqual(+ expect.objectContaining({+ id: user.userId,+ email: user.userEmail,+ status: 'active',+ deletedAt: null,+ }),+ );+ });});});diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.jsonindex 3067b25449..351d865608 100644--- a/open-api/immich-openapi-specs.json+++ b/open-api/immich-openapi-specs.json@@ -539,7 +539,7 @@}],"responses": {- "201": {+ "200": {"content": {"application/json": {"schema": {diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.tsindex 088e30f9d8..d42725a235 100644--- a/open-api/typescript-sdk/src/fetch-client.ts+++ b/open-api/typescript-sdk/src/fetch-client.ts@@ -1475,7 +1475,7 @@ export function restoreUserAdmin({ id }: {id: string;}, opts?: Oazapfts.RequestOpts) {return oazapfts.ok(oazapfts.fetchJson<{- status: 201;+ status: 200;data: UserAdminResponseDto;}>(`/admin/users/${encodeURIComponent(id)}/restore`, {...opts,diff --git a/server/src/controllers/user-admin.controller.ts b/server/src/controllers/user-admin.controller.tsindex d44115be2f..4dfeae949a 100644--- a/server/src/controllers/user-admin.controller.ts+++ b/server/src/controllers/user-admin.controller.ts@@ -1,4 +1,4 @@-import { Body, Controller, Delete, Get, Param, Post, Put, Query } from '@nestjs/common';+import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';import { ApiTags } from '@nestjs/swagger';import { AuthDto } from 'src/dtos/auth.dto';import { UserPreferencesResponseDto, UserPreferencesUpdateDto } from 'src/dtos/user-preferences.dto';@@ -75,6 +75,7 @@ export class UserAdminController {@Post(':id/restore')@Authenticated({ permission: Permission.ADMIN_USER_DELETE, admin: true })+ @HttpCode(HttpStatus.OK)restoreUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {return this.service.restore(auth, id);}diff --git a/server/src/interfaces/user.interface.ts b/server/src/interfaces/user.interface.tsindex 6ff3fc824a..f126b6eb34 100644--- a/server/src/interfaces/user.interface.ts+++ b/server/src/interfaces/user.interface.ts@@ -36,6 +36,7 @@ export interface IUserRepository {getUserStats(): Promise<UserStatsQueryResponse[]>;create(user: Insertable<Users>): Promise<UserEntity>;update(id: string, user: Updateable<Users>): Promise<UserEntity>;+ restore(id: string): Promise<UserEntity>;upsertMetadata<T extends keyof UserMetadata>(id: string, item: { key: T; value: UserMetadata[T] }): Promise<void>;deleteMetadata<T extends keyof UserMetadata>(id: string, key: T): Promise<void>;delete(user: UserEntity, hard?: boolean): Promise<UserEntity>;diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.tsindex e7c65b3f01..417ee141f4 100644--- a/server/src/repositories/user.repository.ts+++ b/server/src/repositories/user.repository.ts@@ -5,6 +5,7 @@ import { DB, UserMetadata as DbUserMetadata, Users } from 'src/db';import { DummyValue, GenerateSql } from 'src/decorators';import { UserMetadata } from 'src/entities/user-metadata.entity';import { UserEntity, withMetadata } from 'src/entities/user.entity';+import { UserStatus } from 'src/enum';import {IUserRepository,UserFindOptions,@@ -140,6 +141,16 @@ export class UserRepository implements IUserRepository {.executeTakeFirst() as unknown as Promise<UserEntity>;}+ restore(id: string): Promise<UserEntity> {+ return this.db+ .updateTable('users')+ .set({ status: UserStatus.ACTIVE, deletedAt: null })+ .where('users.id', '=', asUuid(id))+ .returning(columns)+ .returning(withMetadata)+ .executeTakeFirst() as unknown as Promise<UserEntity>;+ }+async upsertMetadata<T extends keyof UserMetadata>(id: string, { key, value }: { key: T; value: UserMetadata[T] }) {await this.db.insertInto('user_metadata')diff --git a/server/src/services/user-admin.service.spec.ts b/server/src/services/user-admin.service.spec.tsindex 6d2bc31cb7..b14f1c8655 100644--- a/server/src/services/user-admin.service.spec.ts+++ b/server/src/services/user-admin.service.spec.ts@@ -173,9 +173,9 @@ describe(UserAdminService.name, () => {it('should restore an user', async () => {userMock.get.mockResolvedValue(userStub.user1);- userMock.update.mockResolvedValue(userStub.user1);+ userMock.restore.mockResolvedValue(userStub.user1);await expect(sut.restore(authStub.admin, userStub.user1.id)).resolves.toEqual(mapUserAdmin(userStub.user1));- expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, { status: UserStatus.ACTIVE, deletedAt: null });+ expect(userMock.restore).toHaveBeenCalledWith(userStub.user1.id);});});});diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.tsindex a4be671c22..784c95954e 100644--- a/server/src/services/user-admin.service.ts+++ b/server/src/services/user-admin.service.ts@@ -102,7 +102,7 @@ export class UserAdminService extends BaseService {async restore(auth: AuthDto, id: string): Promise<UserAdminResponseDto> {await this.findOrFail(id, { withDeleted: true });await this.albumRepository.restoreAll(id);- const user = await this.userRepository.update(id, { deletedAt: null, status: UserStatus.ACTIVE });+ const user = await this.userRepository.restore(id);return mapUserAdmin(user);}diff --git a/server/test/repositories/user.repository.mock.ts b/server/test/repositories/user.repository.mock.tsindex 6362ab6a99..e6e8c38184 100644--- a/server/test/repositories/user.repository.mock.ts+++ b/server/test/repositories/user.repository.mock.ts@@ -13,6 +13,7 @@ export const newUserRepositoryMock = (): Mocked<IUserRepository> => {create: vitest.fn(),update: vitest.fn(),delete: vitest.fn(),+ restore: vitest.fn(),getDeletedUsers: vitest.fn(),hasAdmin: vitest.fn(),updateUsage: vitest.fn(),