From bcda871818a17c8e8c67aa1dfb9cfcf1a3cf2b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Thu, 19 Oct 2023 06:18:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?NotesStream=E3=81=AB=E6=B5=81=E3=81=99?= =?UTF-8?q?=E6=96=B0=E8=A6=8F=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AF=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E3=81=A7pack=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=20(MisskeyIO#187)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MisskeyIO#134 の不具合修正 --- packages/backend/src/core/NoteCreateService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 11a52807b6..bea536b327 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -552,7 +552,7 @@ export class NoteCreateService implements OnApplicationShutdown { } // Pack the note - const noteObj = await this.noteEntityService.pack(note, user); + const noteObj = await this.noteEntityService.pack(note, null); this.globalEventService.publishNotesStream(noteObj); From 9688704be6114eeb7d4850cede0450aaef865536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Thu, 19 Oct 2023 06:19:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E3=82=A2=E3=82=B5=E3=82=A4=E3=83=B3API=E3=81=A7=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E6=9C=9F=E9=96=93=E3=81=8C=E5=A4=89=E3=82=8F=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AF=E6=9C=9F=E9=99=90=E3=81=A0?= =?UTF-8?q?=E3=81=91=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=20(MisskeyIO#188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/RoleService.ts | 63 ++++++++++--------- .../api/endpoints/admin/roles/assign.ts | 6 ++ .../api/endpoints/admin/roles/unassign.ts | 2 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index 0fc6883922..9713e6274c 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -8,6 +8,7 @@ import * as Redis from 'ioredis'; import { In } from 'typeorm'; import type { MiRole, MiRoleAssignment, RoleAssignmentsRepository, RolesRepository, UsersRepository } from '@/models/index.js'; import { MemoryKVCache, MemorySingleCache } from '@/misc/cache.js'; +import { IdentifiableError } from '@/misc/identifiable-error.js'; import type { MiUser } from '@/models/entities/User.js'; import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; @@ -80,9 +81,6 @@ export class RoleService implements OnApplicationShutdown { private rolesCache: MemorySingleCache; private roleAssignmentByUserIdCache: MemoryKVCache; - public static AlreadyAssignedError = class extends Error {}; - public static NotAssignedError = class extends Error {}; - constructor( @Inject(DI.redis) private redisClient: Redis.Redis, @@ -386,50 +384,53 @@ export class RoleService implements OnApplicationShutdown { public async assign(userId: MiUser['id'], roleId: MiRole['id'], expiresAt: Date | null = null): Promise { const now = new Date(); - const existing = await this.roleAssignmentsRepository.findOneBy({ - roleId: roleId, - userId: userId, - }); - - if (existing) { - if (existing.expiresAt && (existing.expiresAt.getTime() < now.getTime())) { - await this.roleAssignmentsRepository.delete({ - roleId: roleId, - userId: userId, - }); - } else { - throw new RoleService.AlreadyAssignedError(); - } + let existing = await this.roleAssignmentsRepository.findOneBy({ roleId, userId }); + if (existing?.expiresAt && (existing.expiresAt.getTime() < now.getTime())) { + await this.roleAssignmentsRepository.delete({ + roleId: roleId, + userId: userId, + }); + existing = null; } - const created = await this.roleAssignmentsRepository.insert({ - id: this.idService.genId(), - createdAt: now, - expiresAt: expiresAt, - roleId: roleId, - userId: userId, - }).then(x => this.roleAssignmentsRepository.findOneByOrFail(x.identifiers[0])); + if (!existing) { + const created = await this.roleAssignmentsRepository.insert({ + id: this.idService.genId(), + createdAt: now, + expiresAt: expiresAt, + roleId: roleId, + userId: userId, + }).then(x => this.roleAssignmentsRepository.findOneByOrFail(x.identifiers[0])); + + this.globalEventService.publishInternalEvent('userRoleAssigned', created); + } else if (existing.expiresAt !== expiresAt) { + await this.roleAssignmentsRepository.update(existing.id, { + expiresAt: expiresAt, + }); + } else { + throw new IdentifiableError('67d8689c-25c6-435f-8ced-631e4b81fce1', 'User is already assigned to this role.'); + } this.rolesRepository.update(roleId, { lastUsedAt: new Date(), }); - - this.globalEventService.publishInternalEvent('userRoleAssigned', created); } @bindThis public async unassign(userId: MiUser['id'], roleId: MiRole['id']): Promise { const now = new Date(); - const existing = await this.roleAssignmentsRepository.findOneBy({ roleId, userId }); - if (existing == null) { - throw new RoleService.NotAssignedError(); - } else if (existing.expiresAt && (existing.expiresAt.getTime() < now.getTime())) { + let existing = await this.roleAssignmentsRepository.findOneBy({ roleId, userId }); + if (existing?.expiresAt && (existing.expiresAt.getTime() < now.getTime())) { await this.roleAssignmentsRepository.delete({ roleId: roleId, userId: userId, }); - throw new RoleService.NotAssignedError(); + existing = null; + } + + if (!existing) { + throw new IdentifiableError('b9060ac7-5c94-4da4-9f55-2047c953df44', 'User was not assigned to this role.'); } await this.roleAssignmentsRepository.delete(existing.id); diff --git a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts index 78ab13a773..4878cfd05c 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts @@ -29,6 +29,12 @@ export const meta = { id: '558ea170-f653-4700-94d0-5a818371d0df', }, + alreadyAssigned: { + message: 'User is already assigned to this role.', + code: 'ALREADY_ASSIGNED', + id: '67d8689c-25c6-435f-8ced-631e4b81fce1', + }, + accessDenied: { message: 'Only administrators can edit members of the role.', code: 'ACCESS_DENIED', diff --git a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts index 1b3c49571b..ebddd46b52 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts @@ -30,7 +30,7 @@ export const meta = { }, notAssigned: { - message: 'Not assigned.', + message: 'User was not assigned to this role.', code: 'NOT_ASSIGNED', id: 'b9060ac7-5c94-4da4-9f55-2047c953df44', },