diff --git a/server/src/cores/access.core.ts b/server/src/cores/access.core.ts index e2d9d74df5..659412b263 100644 --- a/server/src/cores/access.core.ts +++ b/server/src/cores/access.core.ts @@ -226,7 +226,7 @@ export class AccessCore { const isShared = await this.repository.album.checkSharedAlbumAccess( auth.user.id, setDifference(ids, isOwner), - AlbumUserRole.Viewer, + AlbumUserRole.VIEWER, ); return setUnion(isOwner, isShared); } @@ -236,7 +236,7 @@ export class AccessCore { const isShared = await this.repository.album.checkSharedAlbumAccess( auth.user.id, setDifference(ids, isOwner), - AlbumUserRole.Editor, + AlbumUserRole.EDITOR, ); return setUnion(isOwner, isShared); } @@ -258,7 +258,7 @@ export class AccessCore { const isShared = await this.repository.album.checkSharedAlbumAccess( auth.user.id, setDifference(ids, isOwner), - AlbumUserRole.Viewer, + AlbumUserRole.VIEWER, ); return setUnion(isOwner, isShared); } diff --git a/server/src/entities/album-user.entity.ts b/server/src/entities/album-user.entity.ts index 084617dd41..2054f38993 100644 --- a/server/src/entities/album-user.entity.ts +++ b/server/src/entities/album-user.entity.ts @@ -3,8 +3,8 @@ import { UserEntity } from 'src/entities/user.entity'; import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'; export enum AlbumUserRole { - Editor = 'editor', - Viewer = 'viewer', + EDITOR = 'editor', + VIEWER = 'viewer', } @Entity('albums_shared_users_users') diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts index c33ab1608b..fab9424c28 100644 --- a/server/src/repositories/access.repository.ts +++ b/server/src/repositories/access.repository.ts @@ -137,7 +137,7 @@ class AlbumAccess implements IAlbumAccess { user: { id: userId }, // If editor access is needed we check for it, otherwise both are accepted role: - access === AlbumUserRole.Editor ? AlbumUserRole.Editor : In([AlbumUserRole.Editor, AlbumUserRole.Viewer]), + access === AlbumUserRole.EDITOR ? AlbumUserRole.EDITOR : In([AlbumUserRole.EDITOR, AlbumUserRole.VIEWER]), }, }, }) diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts index f967162fc9..b1cfdb204a 100644 --- a/server/src/services/album.service.spec.ts +++ b/server/src/services/album.service.spec.ts @@ -366,7 +366,7 @@ describe(AlbumService.name, () => { user: userStub.user2, albumId: albumStub.sharedWithAdmin.id, album: albumStub.sharedWithAdmin, - role: AlbumUserRole.Editor, + role: AlbumUserRole.EDITOR, }); await sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, { sharedUserIds: [authStub.user2.user.id] }); expect(albumUserMock.create).toHaveBeenCalledWith({ @@ -520,7 +520,7 @@ describe(AlbumService.name, () => { expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith( authStub.user1.user.id, new Set(['album-123']), - AlbumUserRole.Viewer, + AlbumUserRole.VIEWER, ); }); @@ -531,7 +531,7 @@ describe(AlbumService.name, () => { expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith( authStub.admin.user.id, new Set(['album-123']), - AlbumUserRole.Viewer, + AlbumUserRole.VIEWER, ); }); }); diff --git a/server/test/fixtures/album.stub.ts b/server/test/fixtures/album.stub.ts index 999cf2928d..89755d8b34 100644 --- a/server/test/fixtures/album.stub.ts +++ b/server/test/fixtures/album.stub.ts @@ -39,7 +39,7 @@ export const albumStub = { { user: userStub.user1, album: undefined as unknown as AlbumEntity, - role: AlbumUserRole.Editor, + role: AlbumUserRole.EDITOR, userId: userStub.user1.id, albumId: 'album-2', }, @@ -64,14 +64,14 @@ export const albumStub = { { user: userStub.user1, album: undefined as unknown as AlbumEntity, - role: AlbumUserRole.Editor, + role: AlbumUserRole.EDITOR, userId: userStub.user1.id, albumId: 'album-3', }, { user: userStub.user2, album: undefined as unknown as AlbumEntity, - role: AlbumUserRole.Editor, + role: AlbumUserRole.EDITOR, userId: userStub.user2.id, albumId: 'album-3', }, @@ -96,7 +96,7 @@ export const albumStub = { { user: userStub.admin, album: undefined as unknown as AlbumEntity, - role: AlbumUserRole.Editor, + role: AlbumUserRole.EDITOR, userId: userStub.admin.id, albumId: 'album-3', },