Skip to content

High performance self-hosted photo and video management solution.

feat: cluster group admin permission for regenerate people (#32787)

Daniel Dietzler9f273a604d5b
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 13244d1666..6cf8848870 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -6333,7 +6333,7 @@
"state": "Added"
}
],
- "x-immich-permission": "clusterGroup.read"
+ "x-immich-permission": "clusterGroup.admin"
}
},
"/cluster-groups/{id}/requests": {
@@ -25782,6 +25782,7 @@
"backup.delete",
"clusterGroup.read",
"clusterGroup.leave",
+ "clusterGroup.admin",
"clusterGroupRequest.create",
"clusterGroupRequest.read",
"clusterGroupRequest.delete",
diff --git a/packages/sdk/src/fetch-client.ts b/packages/sdk/src/fetch-client.ts
index 860e6093af..6e870cad8c 100644
--- a/packages/sdk/src/fetch-client.ts
+++ b/packages/sdk/src/fetch-client.ts
@@ -8351,6 +8351,7 @@ export enum Permission {
BackupDelete = "backup.delete",
ClusterGroupRead = "clusterGroup.read",
ClusterGroupLeave = "clusterGroup.leave",
+ ClusterGroupAdmin = "clusterGroup.admin",
ClusterGroupRequestCreate = "clusterGroupRequest.create",
ClusterGroupRequestRead = "clusterGroupRequest.read",
ClusterGroupRequestDelete = "clusterGroupRequest.delete",
diff --git a/server/src/controllers/cluster-group.controller.ts b/server/src/controllers/cluster-group.controller.ts
index d72598cc1c..5675c19b0b 100644
--- a/server/src/controllers/cluster-group.controller.ts
+++ b/server/src/controllers/cluster-group.controller.ts
@@ -94,7 +94,7 @@ export class ClusterGroupController {
}
@Post(':id/regenerate-people')
- @Authenticated({ permission: Permission.ClusterGroupRead })
+ @Authenticated({ permission: Permission.ClusterGroupAdmin })
@HttpCode(HttpStatus.NO_CONTENT)
@Endpoint({
summary: 'Regenerate people of users in cluster group',
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 6691415e61..4f69ddf258 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -193,6 +193,7 @@ export enum Permission {
ClusterGroupRead = 'clusterGroup.read',
ClusterGroupLeave = 'clusterGroup.leave',
+ ClusterGroupAdmin = 'clusterGroup.admin',
ClusterGroupRequestCreate = 'clusterGroupRequest.create',
ClusterGroupRequestRead = 'clusterGroupRequest.read',
ClusterGroupRequestDelete = 'clusterGroupRequest.delete',
diff --git a/server/src/services/cluster-group.service.ts b/server/src/services/cluster-group.service.ts
index cd3e78bb90..dd24f54405 100644
--- a/server/src/services/cluster-group.service.ts
+++ b/server/src/services/cluster-group.service.ts
@@ -73,7 +73,7 @@ export class ClusterGroupService extends BaseService {
}
async regeneratePeople(auth: AuthDto, id: string) {
- await this.requireAccess({ auth, permission: Permission.ClusterGroupRead, ids: [id] });
+ await this.requireAccess({ auth, permission: Permission.ClusterGroupAdmin, ids: [id] });
await this.jobRepository.queue({
name: JobName.FacialRecognitionQueueAll,
diff --git a/server/src/utils/access.ts b/server/src/utils/access.ts
index ca4107cb0c..9cbcc97401 100644
--- a/server/src/utils/access.ts
+++ b/server/src/utils/access.ts
@@ -368,6 +368,10 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
return access.person.checkFaceOwnerAccess(auth.user.id, ids);
}
+ case Permission.ClusterGroupAdmin: {
+ return access.clusterGroup.checkOwnerAccess(auth.user.id, ids);
+ }
+
case Permission.ClusterGroupRead: {
const isMember = await access.clusterGroup.checkOwnerAccess(auth.user.id, ids);
const isInvited = await access.clusterGroup.checkInviteAccess(auth.user.id, ids.difference(isMember));