@meridianjs/meridian 2.6.0 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/admin/api-tokens/[id]/route.d.ts +3 -0
- package/dist/api/admin/api-tokens/[id]/route.d.ts.map +1 -0
- package/dist/api/admin/api-tokens/[id]/route.js +20 -0
- package/dist/api/admin/api-tokens/[id]/route.js.map +1 -0
- package/dist/api/admin/api-tokens/route.d.ts +15 -0
- package/dist/api/admin/api-tokens/route.d.ts.map +1 -0
- package/dist/api/admin/api-tokens/route.js +63 -0
- package/dist/api/admin/api-tokens/route.js.map +1 -0
- package/dist/api/admin/issues/[id]/activities/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/activities/route.js +4 -15
- package/dist/api/admin/issues/[id]/activities/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/attachments/[attachmentId]/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/attachments/[attachmentId]/route.js +6 -1
- package/dist/api/admin/issues/[id]/attachments/[attachmentId]/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/attachments/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/attachments/route.js +2 -19
- package/dist/api/admin/issues/[id]/attachments/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/comments/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/comments/route.js +4 -20
- package/dist/api/admin/issues/[id]/comments/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/related/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/related/route.js +4 -5
- package/dist/api/admin/issues/[id]/related/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/relations/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/relations/route.js +4 -5
- package/dist/api/admin/issues/[id]/relations/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/route.js +12 -12
- package/dist/api/admin/issues/[id]/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/[logId]/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/[logId]/route.js +7 -2
- package/dist/api/admin/issues/[id]/time-logs/[logId]/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/route.js +1 -18
- package/dist/api/admin/issues/[id]/time-logs/route.js.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/timer/route.d.ts.map +1 -1
- package/dist/api/admin/issues/[id]/time-logs/timer/route.js +1 -18
- package/dist/api/admin/issues/[id]/time-logs/timer/route.js.map +1 -1
- package/dist/api/admin/issues/route.d.ts.map +1 -1
- package/dist/api/admin/issues/route.js +20 -4
- package/dist/api/admin/issues/route.js.map +1 -1
- package/dist/api/admin/my/tasks/route.d.ts.map +1 -1
- package/dist/api/admin/my/tasks/route.js +22 -5
- package/dist/api/admin/my/tasks/route.js.map +1 -1
- package/dist/api/admin/org/calendar/route.d.ts.map +1 -1
- package/dist/api/admin/org/calendar/route.js +2 -1
- package/dist/api/admin/org/calendar/route.js.map +1 -1
- package/dist/api/admin/org/holidays/[holidayId]/route.d.ts.map +1 -1
- package/dist/api/admin/org/holidays/[holidayId]/route.js +3 -2
- package/dist/api/admin/org/holidays/[holidayId]/route.js.map +1 -1
- package/dist/api/admin/org/holidays/route.d.ts.map +1 -1
- package/dist/api/admin/org/holidays/route.js +2 -1
- package/dist/api/admin/org/holidays/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/access/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/access/route.js +14 -11
- package/dist/api/admin/projects/[id]/access/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/access-requests/[requestId]/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/access-requests/[requestId]/route.js +3 -2
- package/dist/api/admin/projects/[id]/access-requests/[requestId]/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/access-requests/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/access-requests/route.js +18 -19
- package/dist/api/admin/projects/[id]/access-requests/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/activities/route.js +1 -1
- package/dist/api/admin/projects/[id]/activities/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/health/[updateId]/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/health/[updateId]/route.js +3 -3
- package/dist/api/admin/projects/[id]/health/[updateId]/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/health/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/health/route.js +3 -3
- package/dist/api/admin/projects/[id]/health/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/members/batch/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/members/batch/route.js +3 -2
- package/dist/api/admin/projects/[id]/members/batch/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/members/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/members/route.js +4 -3
- package/dist/api/admin/projects/[id]/members/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/share/route.d.ts.map +1 -1
- package/dist/api/admin/projects/[id]/share/route.js +5 -4
- package/dist/api/admin/projects/[id]/share/route.js.map +1 -1
- package/dist/api/admin/projects/[id]/statuses/route.js +1 -1
- package/dist/api/admin/projects/[id]/statuses/route.js.map +1 -1
- package/dist/api/admin/projects/by-identifier/[identifier]/access-requests/route.d.ts.map +1 -1
- package/dist/api/admin/projects/by-identifier/[identifier]/access-requests/route.js +4 -3
- package/dist/api/admin/projects/by-identifier/[identifier]/access-requests/route.js.map +1 -1
- package/dist/api/admin/projects/route.d.ts.map +1 -1
- package/dist/api/admin/projects/route.js +7 -5
- package/dist/api/admin/projects/route.js.map +1 -1
- package/dist/api/admin/reporting/members/route.d.ts.map +1 -1
- package/dist/api/admin/reporting/members/route.js +6 -5
- package/dist/api/admin/reporting/members/route.js.map +1 -1
- package/dist/api/admin/reporting/time-logs/route.d.ts.map +1 -1
- package/dist/api/admin/reporting/time-logs/route.js +31 -9
- package/dist/api/admin/reporting/time-logs/route.js.map +1 -1
- package/dist/api/admin/team/tasks/route.d.ts.map +1 -1
- package/dist/api/admin/team/tasks/route.js +29 -13
- package/dist/api/admin/team/tasks/route.js.map +1 -1
- package/dist/api/admin/users/[id]/reactivate/route.d.ts.map +1 -1
- package/dist/api/admin/users/[id]/reactivate/route.js +2 -1
- package/dist/api/admin/users/[id]/reactivate/route.js.map +1 -1
- package/dist/api/admin/users/[id]/route.d.ts.map +1 -1
- package/dist/api/admin/users/[id]/route.js +6 -5
- package/dist/api/admin/users/[id]/route.js.map +1 -1
- package/dist/api/admin/users/[id]/sessions/route.d.ts.map +1 -1
- package/dist/api/admin/users/[id]/sessions/route.js +6 -5
- package/dist/api/admin/users/[id]/sessions/route.js.map +1 -1
- package/dist/api/admin/users/invitations/[inviteId]/resend/route.d.ts.map +1 -1
- package/dist/api/admin/users/invitations/[inviteId]/resend/route.js +3 -2
- package/dist/api/admin/users/invitations/[inviteId]/resend/route.js.map +1 -1
- package/dist/api/admin/users/invitations/[inviteId]/route.d.ts.map +1 -1
- package/dist/api/admin/users/invitations/[inviteId]/route.js +2 -1
- package/dist/api/admin/users/invitations/[inviteId]/route.js.map +1 -1
- package/dist/api/admin/users/invitations/route.d.ts.map +1 -1
- package/dist/api/admin/users/invitations/route.js +2 -1
- package/dist/api/admin/users/invitations/route.js.map +1 -1
- package/dist/api/admin/users/invite/route.d.ts.map +1 -1
- package/dist/api/admin/users/invite/route.js +5 -4
- package/dist/api/admin/users/invite/route.js.map +1 -1
- package/dist/api/admin/users/map/route.d.ts.map +1 -1
- package/dist/api/admin/users/map/route.js +8 -5
- package/dist/api/admin/users/map/route.js.map +1 -1
- package/dist/api/admin/users/me/avatar/route.js +1 -1
- package/dist/api/admin/users/me/avatar/route.js.map +1 -1
- package/dist/api/admin/users/me/google/route.js +1 -1
- package/dist/api/admin/users/me/google/route.js.map +1 -1
- package/dist/api/admin/users/me/password/send-otp/route.d.ts.map +1 -1
- package/dist/api/admin/users/me/password/send-otp/route.js +2 -1
- package/dist/api/admin/users/me/password/send-otp/route.js.map +1 -1
- package/dist/api/admin/users/route.d.ts.map +1 -1
- package/dist/api/admin/users/route.js +8 -1
- package/dist/api/admin/users/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/access-requests/[requestId]/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/access-requests/[requestId]/route.js +4 -3
- package/dist/api/admin/workspaces/[id]/access-requests/[requestId]/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/access-requests/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/access-requests/route.js +3 -2
- package/dist/api/admin/workspaces/[id]/access-requests/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/resend/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/resend/route.js +4 -3
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/resend/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/route.js +2 -2
- package/dist/api/admin/workspaces/[id]/invitations/[inviteId]/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/invitations/route.js +6 -5
- package/dist/api/admin/workspaces/[id]/invitations/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/[userId]/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/[userId]/route.js +5 -4
- package/dist/api/admin/workspaces/[id]/members/[userId]/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/batch/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/batch/route.js +3 -2
- package/dist/api/admin/workspaces/[id]/members/batch/route.js.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/[id]/members/route.js +3 -2
- package/dist/api/admin/workspaces/[id]/members/route.js.map +1 -1
- package/dist/api/admin/workspaces/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/route.js +5 -3
- package/dist/api/admin/workspaces/route.js.map +1 -1
- package/dist/api/admin/workspaces/search/route.d.ts.map +1 -1
- package/dist/api/admin/workspaces/search/route.js +25 -16
- package/dist/api/admin/workspaces/search/route.js.map +1 -1
- package/dist/api/auth/_apply-pending-invites.d.ts.map +1 -1
- package/dist/api/auth/_apply-pending-invites.js +6 -5
- package/dist/api/auth/_apply-pending-invites.js.map +1 -1
- package/dist/api/auth/forgot-password/route.d.ts.map +1 -1
- package/dist/api/auth/forgot-password/route.js +2 -1
- package/dist/api/auth/forgot-password/route.js.map +1 -1
- package/dist/api/auth/invite/[token]/route.d.ts.map +1 -1
- package/dist/api/auth/invite/[token]/route.js +15 -5
- package/dist/api/auth/invite/[token]/route.js.map +1 -1
- package/dist/api/auth/register/send-otp/route.d.ts.map +1 -1
- package/dist/api/auth/register/send-otp/route.js +2 -1
- package/dist/api/auth/register/send-otp/route.js.map +1 -1
- package/dist/api/utils/issue-access.d.ts +16 -0
- package/dist/api/utils/issue-access.d.ts.map +1 -0
- package/dist/api/utils/issue-access.js +38 -0
- package/dist/api/utils/issue-access.js.map +1 -0
- package/dist/api/utils/project-access.d.ts +2 -0
- package/dist/api/utils/project-access.d.ts.map +1 -1
- package/dist/api/utils/project-access.js +11 -8
- package/dist/api/utils/project-access.js.map +1 -1
- package/dist/api/utils/request.d.ts +30 -0
- package/dist/api/utils/request.d.ts.map +1 -0
- package/dist/api/utils/request.js +11 -0
- package/dist/api/utils/request.js.map +1 -0
- package/dist/api/utils/workspace-access.d.ts.map +1 -1
- package/dist/api/utils/workspace-access.js +6 -7
- package/dist/api/utils/workspace-access.js.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/subscribers/comment-created.d.ts.map +1 -1
- package/dist/subscribers/comment-created.js +3 -1
- package/dist/subscribers/comment-created.js.map +1 -1
- package/dist/subscribers/issue-assigned.d.ts.map +1 -1
- package/dist/subscribers/issue-assigned.js +3 -1
- package/dist/subscribers/issue-assigned.js.map +1 -1
- package/dist/subscribers/issue-created.d.ts.map +1 -1
- package/dist/subscribers/issue-created.js +2 -1
- package/dist/subscribers/issue-created.js.map +1 -1
- package/dist/subscribers/issue-mentioned.d.ts.map +1 -1
- package/dist/subscribers/issue-mentioned.js +2 -1
- package/dist/subscribers/issue-mentioned.js.map +1 -1
- package/dist/subscribers/issue-status-changed.d.ts +1 -0
- package/dist/subscribers/issue-status-changed.d.ts.map +1 -1
- package/dist/subscribers/issue-status-changed.js +3 -1
- package/dist/subscribers/issue-status-changed.js.map +1 -1
- package/dist/subscribers/password-otp-requested.d.ts.map +1 -1
- package/dist/subscribers/password-otp-requested.js +2 -1
- package/dist/subscribers/password-otp-requested.js.map +1 -1
- package/dist/subscribers/password-reset-requested.d.ts.map +1 -1
- package/dist/subscribers/password-reset-requested.js +2 -1
- package/dist/subscribers/password-reset-requested.js.map +1 -1
- package/dist/subscribers/project-access-request-cancelled.d.ts.map +1 -1
- package/dist/subscribers/project-access-request-cancelled.js +2 -1
- package/dist/subscribers/project-access-request-cancelled.js.map +1 -1
- package/dist/subscribers/project-access-request-resolved.d.ts.map +1 -1
- package/dist/subscribers/project-access-request-resolved.js +2 -1
- package/dist/subscribers/project-access-request-resolved.js.map +1 -1
- package/dist/subscribers/project-access-requested.d.ts.map +1 -1
- package/dist/subscribers/project-access-requested.js +2 -1
- package/dist/subscribers/project-access-requested.js.map +1 -1
- package/dist/subscribers/project-member-added.d.ts.map +1 -1
- package/dist/subscribers/project-member-added.js +2 -1
- package/dist/subscribers/project-member-added.js.map +1 -1
- package/dist/subscribers/registration-otp-requested.d.ts.map +1 -1
- package/dist/subscribers/registration-otp-requested.js +2 -1
- package/dist/subscribers/registration-otp-requested.js.map +1 -1
- package/dist/subscribers/workspace-access-request-cancelled.d.ts.map +1 -1
- package/dist/subscribers/workspace-access-request-cancelled.js +2 -1
- package/dist/subscribers/workspace-access-request-cancelled.js.map +1 -1
- package/dist/subscribers/workspace-access-request-resolved.d.ts.map +1 -1
- package/dist/subscribers/workspace-access-request-resolved.js +2 -1
- package/dist/subscribers/workspace-access-request-resolved.js.map +1 -1
- package/dist/subscribers/workspace-access-requested.d.ts.map +1 -1
- package/dist/subscribers/workspace-access-requested.js +2 -1
- package/dist/subscribers/workspace-access-requested.js.map +1 -1
- package/dist/subscribers/workspace-member-added.d.ts.map +1 -1
- package/dist/subscribers/workspace-member-added.js +2 -1
- package/dist/subscribers/workspace-member-added.js.map +1 -1
- package/dist/subscribers/workspace-member-invited.d.ts.map +1 -1
- package/dist/subscribers/workspace-member-invited.js +2 -1
- package/dist/subscribers/workspace-member-invited.js.map +1 -1
- package/dist/workflows/assign-issue.d.ts.map +1 -1
- package/dist/workflows/assign-issue.js +2 -1
- package/dist/workflows/assign-issue.js.map +1 -1
- package/dist/workflows/complete-sprint.d.ts.map +1 -1
- package/dist/workflows/complete-sprint.js +2 -1
- package/dist/workflows/complete-sprint.js.map +1 -1
- package/dist/workflows/create-invitation.d.ts.map +1 -1
- package/dist/workflows/create-invitation.js +2 -1
- package/dist/workflows/create-invitation.js.map +1 -1
- package/dist/workflows/create-issue.d.ts.map +1 -1
- package/dist/workflows/create-issue.js +2 -1
- package/dist/workflows/create-issue.js.map +1 -1
- package/dist/workflows/create-project.d.ts.map +1 -1
- package/dist/workflows/create-project.js +2 -1
- package/dist/workflows/create-project.js.map +1 -1
- package/dist/workflows/transfer-project.d.ts.map +1 -1
- package/dist/workflows/transfer-project.js +28 -17
- package/dist/workflows/transfer-project.js.map +1 -1
- package/dist/workflows/update-issue-status.d.ts.map +1 -1
- package/dist/workflows/update-issue-status.js +3 -2
- package/dist/workflows/update-issue-status.js.map +1 -1
- package/package.json +7 -6
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import { getAccessibleWorkspaceIds } from "../../../utils/workspace-access.js";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
3
|
+
import { isGlobalAdmin } from "../../../utils/project-access.js";
|
|
2
4
|
async function enrichWithProjects(result, projectService) {
|
|
3
|
-
|
|
5
|
+
// by_project groups can reference projects that aren't on the current page,
|
|
6
|
+
// so the name lookup covers the union of both sets.
|
|
7
|
+
const projectIds = [
|
|
8
|
+
...new Set([
|
|
9
|
+
...result.time_logs.map((l) => l.project_id),
|
|
10
|
+
...(result.by_project ?? []).map((g) => g.project_id),
|
|
11
|
+
].filter(Boolean)),
|
|
12
|
+
];
|
|
4
13
|
if (projectIds.length === 0)
|
|
5
14
|
return result;
|
|
6
15
|
const projects = await projectService.listProjects({ id: projectIds });
|
|
@@ -12,6 +21,10 @@ async function enrichWithProjects(result, projectService) {
|
|
|
12
21
|
project_name: l.project_id ? (projectMap.get(l.project_id)?.name ?? null) : null,
|
|
13
22
|
project_identifier: l.project_id ? (projectMap.get(l.project_id)?.identifier ?? null) : null,
|
|
14
23
|
})),
|
|
24
|
+
by_project: (result.by_project ?? []).map((g) => ({
|
|
25
|
+
...g,
|
|
26
|
+
project_name: g.project_id ? (projectMap.get(g.project_id)?.name ?? null) : null,
|
|
27
|
+
})),
|
|
15
28
|
};
|
|
16
29
|
}
|
|
17
30
|
export const GET = async (req, res) => {
|
|
@@ -20,7 +33,7 @@ export const GET = async (req, res) => {
|
|
|
20
33
|
const { user_id, user_ids, project_id, project_ids, workspace_id, workspace_ids, from, to, limit, offset } = req.query;
|
|
21
34
|
const roles = req.user?.roles ?? [];
|
|
22
35
|
const permissions = req.user?.permissions ?? [];
|
|
23
|
-
const isPrivileged =
|
|
36
|
+
const isPrivileged = isGlobalAdmin(req) || permissions.includes("workspace:admin");
|
|
24
37
|
const filters = {};
|
|
25
38
|
// Support both single workspace_id and comma-separated workspace_ids
|
|
26
39
|
const wsIds = workspace_ids
|
|
@@ -36,14 +49,20 @@ export const GET = async (req, res) => {
|
|
|
36
49
|
const dateFilter = {};
|
|
37
50
|
if (from)
|
|
38
51
|
dateFilter.$gte = new Date(from);
|
|
39
|
-
if (to)
|
|
40
|
-
|
|
52
|
+
if (to) {
|
|
53
|
+
// "to" arrives as yyyy-MM-dd (UTC midnight); an inclusive $lte would
|
|
54
|
+
// exclude logs later that day (timer-stopped logs carry a time
|
|
55
|
+
// component). Use an exclusive bound on the next day instead.
|
|
56
|
+
const end = new Date(to);
|
|
57
|
+
end.setUTCDate(end.getUTCDate() + 1);
|
|
58
|
+
dateFilter.$lt = end;
|
|
59
|
+
}
|
|
41
60
|
filters.logged_date = dateFilter;
|
|
42
61
|
}
|
|
43
62
|
// Server-side user/project filters from query params
|
|
44
63
|
const filterUserIds = user_ids ? user_ids.split(",").filter(Boolean) : user_id ? [user_id] : [];
|
|
45
64
|
const filterProjectIds = project_ids ? project_ids.split(",").filter(Boolean) : project_id ? [project_id] : [];
|
|
46
|
-
const isSuperAdmin = roles.includes(
|
|
65
|
+
const isSuperAdmin = roles.includes(ROLES.SUPER_ADMIN);
|
|
47
66
|
// Super-admin org-scope bypass: skip all workspace privacy filtering
|
|
48
67
|
if (isSuperAdmin && req.query.org_scope === "true") {
|
|
49
68
|
const parsedLimit = limit ? parseInt(limit, 10) : 200;
|
|
@@ -57,6 +76,7 @@ export const GET = async (req, res) => {
|
|
|
57
76
|
res.json({
|
|
58
77
|
time_logs: enriched.time_logs, count: enriched.count, total_minutes: enriched.total_minutes,
|
|
59
78
|
total_employees: enriched.total_employees, total_projects: enriched.total_projects,
|
|
79
|
+
by_user: enriched.by_user, by_project: enriched.by_project,
|
|
60
80
|
limit: parsedLimit, offset: parsedOffset,
|
|
61
81
|
});
|
|
62
82
|
return;
|
|
@@ -64,7 +84,7 @@ export const GET = async (req, res) => {
|
|
|
64
84
|
if (isPrivileged) {
|
|
65
85
|
const allowedIds = await getAccessibleWorkspaceIds(req, wsIds.length > 0 ? wsIds : undefined);
|
|
66
86
|
if (allowedIds.length === 0) {
|
|
67
|
-
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, limit: 0, offset: 0 });
|
|
87
|
+
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, by_user: [], by_project: [], limit: 0, offset: 0 });
|
|
68
88
|
return;
|
|
69
89
|
}
|
|
70
90
|
if (allowedIds.length === 1)
|
|
@@ -83,7 +103,7 @@ export const GET = async (req, res) => {
|
|
|
83
103
|
// Batch-check membership for all requested workspaces in one query
|
|
84
104
|
const memberships = await workspaceMemberService.listWorkspaceMembers({ workspace_id: wsIds.length === 1 ? wsIds[0] : wsIds, user_id: userId });
|
|
85
105
|
if (memberships.length === 0) {
|
|
86
|
-
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, limit: 0, offset: 0 });
|
|
106
|
+
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, by_user: [], by_project: [], limit: 0, offset: 0 });
|
|
87
107
|
return;
|
|
88
108
|
}
|
|
89
109
|
}
|
|
@@ -92,14 +112,14 @@ export const GET = async (req, res) => {
|
|
|
92
112
|
const accessible = new Set(allAccessibleProjectIds);
|
|
93
113
|
const allowed = filterProjectIds.filter((id) => accessible.has(id));
|
|
94
114
|
if (allowed.length === 0) {
|
|
95
|
-
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, limit: 0, offset: 0 });
|
|
115
|
+
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, by_user: [], by_project: [], limit: 0, offset: 0 });
|
|
96
116
|
return;
|
|
97
117
|
}
|
|
98
118
|
filters.project_id = allowed;
|
|
99
119
|
}
|
|
100
120
|
else {
|
|
101
121
|
if (allAccessibleProjectIds.length === 0) {
|
|
102
|
-
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, limit: 0, offset: 0 });
|
|
122
|
+
res.json({ time_logs: [], count: 0, total_minutes: 0, total_employees: 0, total_projects: 0, by_user: [], by_project: [], limit: 0, offset: 0 });
|
|
103
123
|
return;
|
|
104
124
|
}
|
|
105
125
|
filters.project_id = allAccessibleProjectIds;
|
|
@@ -125,6 +145,8 @@ export const GET = async (req, res) => {
|
|
|
125
145
|
total_minutes: enriched.total_minutes,
|
|
126
146
|
total_employees: enriched.total_employees,
|
|
127
147
|
total_projects: enriched.total_projects,
|
|
148
|
+
by_user: enriched.by_user,
|
|
149
|
+
by_project: enriched.by_project,
|
|
128
150
|
limit: parsedLimit,
|
|
129
151
|
offset: parsedOffset,
|
|
130
152
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/reporting/time-logs/route.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/reporting/time-logs/route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/team/tasks/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/team/tasks/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIvC,eAAO,MAAM,GAAG,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,kBAmLhD,CAAA"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { getAccessibleWorkspaceIds } from "../../../utils/workspace-access.js";
|
|
2
|
+
import { isGlobalAdmin } from "../../../utils/project-access.js";
|
|
2
3
|
export const GET = async (req, res) => {
|
|
3
4
|
// ── Auth: require privileged caller ──
|
|
4
|
-
const roles = req.user?.roles ?? [];
|
|
5
5
|
const permissions = req.user?.permissions ?? [];
|
|
6
|
-
const isPrivileged =
|
|
7
|
-
roles.includes("admin") ||
|
|
8
|
-
permissions.includes("workspace:admin");
|
|
6
|
+
const isPrivileged = isGlobalAdmin(req) || permissions.includes("workspace:admin");
|
|
9
7
|
if (!isPrivileged) {
|
|
10
8
|
res.status(403).json({ error: { message: "Forbidden — admin access required" } });
|
|
11
9
|
return;
|
|
@@ -26,12 +24,13 @@ export const GET = async (req, res) => {
|
|
|
26
24
|
const limit = Math.min(Number(req.query.limit) || 50, 200);
|
|
27
25
|
const offset = Number(req.query.offset) || 0;
|
|
28
26
|
// ── Workspace scoping ──
|
|
29
|
-
const
|
|
27
|
+
const globalAdmin = isGlobalAdmin(req);
|
|
30
28
|
const issueFilters = {
|
|
31
29
|
assignee_ids: { $contains: targetUserId },
|
|
32
30
|
};
|
|
33
|
-
//
|
|
34
|
-
|
|
31
|
+
// Global admins (super-admin/admin) see all workspaces, consistent with the
|
|
32
|
+
// redaction logic below; workspace:admin-permission callers stay scoped.
|
|
33
|
+
if (!globalAdmin) {
|
|
35
34
|
let accessibleWsIds = await getAccessibleWorkspaceIds(req);
|
|
36
35
|
if (req.query.workspace_id) {
|
|
37
36
|
const requested = req.query.workspace_id.split(",").filter(Boolean);
|
|
@@ -45,7 +44,7 @@ export const GET = async (req, res) => {
|
|
|
45
44
|
issueFilters.workspace_id = accessibleWsIds.length === 1 ? accessibleWsIds[0] : { $in: accessibleWsIds };
|
|
46
45
|
}
|
|
47
46
|
else if (req.query.workspace_id) {
|
|
48
|
-
//
|
|
47
|
+
// Global admin with workspace filter
|
|
49
48
|
const wsIds = req.query.workspace_id.split(",").filter(Boolean);
|
|
50
49
|
if (wsIds.length > 0) {
|
|
51
50
|
issueFilters.workspace_id = wsIds.length === 1 ? wsIds[0] : { $in: wsIds };
|
|
@@ -59,11 +58,22 @@ export const GET = async (req, res) => {
|
|
|
59
58
|
const types = req.query.type.split(",").filter(Boolean);
|
|
60
59
|
issueFilters.type = types.length === 1 ? types[0] : { $in: types };
|
|
61
60
|
}
|
|
62
|
-
|
|
61
|
+
// Fetch the COMPLETE assigned set in batches — counts and the JS category
|
|
62
|
+
// filter below must operate on all rows, not a truncated window.
|
|
63
|
+
const BATCH = 500;
|
|
64
|
+
const HARD_CAP = 5000;
|
|
65
|
+
let issues = [];
|
|
66
|
+
let dbCount = 0;
|
|
67
|
+
do {
|
|
68
|
+
const [batch, total] = await issueService.listAndCountIssues(issueFilters, { limit: BATCH, offset: issues.length, orderBy: { updated_at: "DESC" } });
|
|
69
|
+
dbCount = total;
|
|
70
|
+
issues = issues.concat(batch);
|
|
71
|
+
if (batch.length === 0)
|
|
72
|
+
break;
|
|
73
|
+
} while (issues.length < dbCount && issues.length < HARD_CAP);
|
|
63
74
|
// ── Determine viewer's accessible projects ──
|
|
64
|
-
const isGlobalAdmin = roles.includes("super-admin") || roles.includes("admin");
|
|
65
75
|
let viewerAccessibleProjectIds;
|
|
66
|
-
if (
|
|
76
|
+
if (globalAdmin) {
|
|
67
77
|
// Global admins can see all projects
|
|
68
78
|
viewerAccessibleProjectIds = new Set(issues.map((i) => i.project_id));
|
|
69
79
|
}
|
|
@@ -126,14 +136,20 @@ export const GET = async (req, res) => {
|
|
|
126
136
|
_private: false,
|
|
127
137
|
};
|
|
128
138
|
});
|
|
139
|
+
// Per-category totals over the FULL enriched set — lets the client render
|
|
140
|
+
// exact column counts regardless of how many rows it has paged in.
|
|
141
|
+
const category_counts = {};
|
|
142
|
+
for (const i of enriched) {
|
|
143
|
+
category_counts[i._status.category] = (category_counts[i._status.category] ?? 0) + 1;
|
|
144
|
+
}
|
|
129
145
|
// ── Category filter (post-enrichment) ──
|
|
130
146
|
if (req.query.category) {
|
|
131
147
|
const categories = req.query.category.split(",").filter(Boolean);
|
|
132
148
|
const filtered = enriched.filter((i) => categories.includes(i._status.category));
|
|
133
|
-
res.json({ issues: filtered.slice(offset, offset + limit), count: filtered.length, limit, offset });
|
|
149
|
+
res.json({ issues: filtered.slice(offset, offset + limit), count: filtered.length, limit, offset, category_counts });
|
|
134
150
|
return;
|
|
135
151
|
}
|
|
136
152
|
const count = enriched.length;
|
|
137
|
-
res.json({ issues: enriched.slice(offset, offset + limit), count, limit, offset });
|
|
153
|
+
res.json({ issues: enriched.slice(offset, offset + limit), count, limit, offset, category_counts });
|
|
138
154
|
};
|
|
139
155
|
//# sourceMappingURL=route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/team/tasks/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/team/tasks/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAEhE,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAa,EAAE,EAAE;IACnD,wCAAwC;IACxC,MAAM,WAAW,GAAa,GAAG,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,CAAA;IACzD,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IAElF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,mCAAmC,EAAE,EAAE,CAAC,CAAA;QACjF,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAW,GAAG,CAAC,IAAI,EAAE,EAAE,CAAA;IACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;QAC5D,OAAM;IACR,CAAC;IAED,oBAAoB;IACpB,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAA6B,CAAA;IAC5D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,qCAAqC,EAAE,EAAE,CAAC,CAAA;QACnF,OAAM;IACR,CAAC;IAED,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAQ,CAAA;IACnE,MAAM,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAQ,CAAA;IAEvE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAA;IAC1D,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAE5C,0BAA0B;IAC1B,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IACtC,MAAM,YAAY,GAA4B;QAC5C,YAAY,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE;KAC1C,CAAA;IAED,4EAA4E;IAC5E,yEAAyE;IACzE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,eAAe,GAAG,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAA;QAE1D,IAAI,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAI,GAAG,CAAC,KAAK,CAAC,YAAuB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC/E,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAA;YAC9C,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QACnE,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YACjD,OAAM;QACR,CAAC;QAED,YAAY,CAAC,YAAY,GAAG,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAA;IAC1G,CAAC;SAAM,IAAI,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAClC,qCAAqC;QACrC,MAAM,KAAK,GAAI,GAAG,CAAC,KAAK,CAAC,YAAuB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC3E,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,YAAY,CAAC,YAAY,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;QAC5E,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,UAAU,GAAI,GAAG,CAAC,KAAK,CAAC,QAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC5E,YAAY,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;IACvF,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,KAAK,GAAI,GAAG,CAAC,KAAK,CAAC,IAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACnE,YAAY,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAA;IACpE,CAAC;IAED,0EAA0E;IAC1E,iEAAiE;IACjE,MAAM,KAAK,GAAG,GAAG,CAAA;IACjB,MAAM,QAAQ,GAAG,IAAI,CAAA;IACrB,IAAI,MAAM,GAAU,EAAE,CAAA;IACtB,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,GAAG,CAAC;QACF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAC1D,YAAY,EACZ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CACzE,CAAA;QACD,OAAO,GAAG,KAAK,CAAA;QACf,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,MAAK;IAC/B,CAAC,QAAQ,MAAM,CAAC,MAAM,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,GAAG,QAAQ,EAAC;IAE7D,+CAA+C;IAC/C,IAAI,0BAAuC,CAAA;IAE3C,IAAI,WAAW,EAAE,CAAC;QAChB,qCAAqC;QACrC,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IAC5E,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,yBAAyB,CAAQ,CAAA;QAC7E,MAAM,oBAAoB,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4BAA4B,CAAQ,CAAA;QACnF,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QACtE,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC9F,0BAA0B,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAA;IAClD,CAAC;IAED,0CAA0C;IAC1C,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAa,CAAA;IAEjF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAgD,CAAA;IAC1E,MAAM,SAAS,GAAG,IAAI,GAAG,EAA6D,CAAA;IAEtF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAC1D,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAC3B,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,CAC7B,CAAA;QACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,kBAAkB,CACzD,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAC7E,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,GAAG,EAAE,EAAE,CAClC,CAAA;YACD,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;gBAC5B,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;YACnG,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,wCAAwC;QAC1C,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;QACzC,MAAM,YAAY,GAAG,0BAA0B,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACrE,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QAEnE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO;gBACL,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,eAAe;gBACtB,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,MAAM;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,KAAK,EAAE;gBACxD,OAAO,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;gBAChF,QAAQ,EAAE,IAAI;aACf,CAAA;QACH,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE,IAAI,IAAI,IAAI;YACtB,OAAO,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE;YAChF,QAAQ,EAAE,KAAK;SAChB,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,mEAAmE;IACnE,MAAM,eAAe,GAA2B,EAAE,CAAA;IAClD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;IACtF,CAAC;IAED,0CAA0C;IAC1C,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,UAAU,GAAI,GAAG,CAAC,KAAK,CAAC,QAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC5E,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QACrF,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;QACpH,OAAM;IACR,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAA;IAC7B,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;AACrG,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/reactivate/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/reactivate/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAIrD,eAAO,MAAM,IAAI,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBAWrE,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
2
3
|
export const POST = async (req, res, next) => {
|
|
3
|
-
requireRoles(
|
|
4
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
4
5
|
try {
|
|
5
6
|
const userService = req.scope.resolve("userModuleService");
|
|
6
7
|
const user = await userService.reactivateUser(req.params.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/reactivate/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/reactivate/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACxE,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;QAChE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAQ,CAAA;YACjE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC5D,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAW,CAAA;YACjD,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/[id]/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/[id]/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAsBrD,eAAO,MAAM,KAAK,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBAiCtE,CAAA;AAED,eAAO,MAAM,MAAM,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA4BvE,CAAA"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
2
3
|
const ROLE_RANK = {
|
|
3
|
-
|
|
4
|
-
|
|
4
|
+
[ROLES.SUPER_ADMIN]: 3,
|
|
5
|
+
[ROLES.ADMIN]: 2,
|
|
5
6
|
"moderator": 1,
|
|
6
|
-
|
|
7
|
+
[ROLES.MEMBER]: 0,
|
|
7
8
|
};
|
|
8
9
|
function actorRank(req) {
|
|
9
10
|
const roles = req.user?.roles ?? [];
|
|
@@ -15,7 +16,7 @@ async function targetRank(req) {
|
|
|
15
16
|
return ROLE_RANK[target.role] ?? 0;
|
|
16
17
|
}
|
|
17
18
|
export const PATCH = async (req, res, next) => {
|
|
18
|
-
requireRoles(
|
|
19
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
19
20
|
try {
|
|
20
21
|
const actor = actorRank(req);
|
|
21
22
|
const target = await targetRank(req);
|
|
@@ -46,7 +47,7 @@ export const PATCH = async (req, res, next) => {
|
|
|
46
47
|
});
|
|
47
48
|
};
|
|
48
49
|
export const DELETE = async (req, res, next) => {
|
|
49
|
-
requireRoles(
|
|
50
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
50
51
|
try {
|
|
51
52
|
if (req.params.id === req.user?.id) {
|
|
52
53
|
res.status(400).json({ error: { message: "You cannot deactivate yourself" } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/[id]/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/[id]/route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/sessions/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/sessions/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAgBrD,+FAA+F;AAC/F,eAAO,MAAM,MAAM,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBAuBvE,CAAA"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
2
3
|
const ROLE_RANK = {
|
|
3
|
-
|
|
4
|
-
|
|
4
|
+
[ROLES.SUPER_ADMIN]: 3,
|
|
5
|
+
[ROLES.ADMIN]: 2,
|
|
5
6
|
"moderator": 1,
|
|
6
|
-
|
|
7
|
+
[ROLES.MEMBER]: 0,
|
|
7
8
|
};
|
|
8
9
|
function actorRank(req) {
|
|
9
10
|
const roles = req.user?.roles ?? [];
|
|
@@ -11,7 +12,7 @@ function actorRank(req) {
|
|
|
11
12
|
}
|
|
12
13
|
/** DELETE /admin/users/:id/sessions — revoke all active sessions for a user (admin action). */
|
|
13
14
|
export const DELETE = async (req, res, next) => {
|
|
14
|
-
requireRoles(
|
|
15
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
15
16
|
try {
|
|
16
17
|
const userService = req.scope.resolve("userModuleService");
|
|
17
18
|
const target = await userService.retrieveUser(req.params.id);
|
|
@@ -25,7 +26,7 @@ export const DELETE = async (req, res, next) => {
|
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
28
|
await userService.revokeAllUserSessions(req.params.id);
|
|
28
|
-
res.
|
|
29
|
+
res.status(204).end();
|
|
29
30
|
}
|
|
30
31
|
catch (err) {
|
|
31
32
|
next(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/sessions/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/[id]/sessions/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,SAAS,GAA2B;IACxC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;IACtB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;IAChB,WAAW,EAAE,CAAC;IACd,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;CAClB,CAAA;AAED,SAAS,SAAS,CAAC,GAAQ;IACzB,MAAM,KAAK,GAAa,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAA;IAC7C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAC5D,CAAC;AAED,+FAA+F;AAC/F,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IAC1E,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;QAChE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAQ,CAAA;YACjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAE5D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAA;gBAC9D,OAAM;YACR,CAAC;YAED,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,6DAA6D,EAAE,EAAE,CAAC,CAAA;gBAC3G,OAAM;YACR,CAAC;YAED,MAAM,WAAW,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/admin/users/invitations/[inviteId]/resend/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/admin/users/invitations/[inviteId]/resend/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIvC,eAAO,MAAM,IAAI,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,kBAkCjD,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { EVENTS, ROLES } from "@meridianjs/types";
|
|
2
3
|
export const POST = async (req, res) => {
|
|
3
|
-
requireRoles(
|
|
4
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
4
5
|
const svc = req.scope.resolve("invitationModuleService");
|
|
5
6
|
const invitation = await svc.retrieveInvitation(req.params.inviteId).catch(() => null);
|
|
6
7
|
if (!invitation) {
|
|
@@ -17,7 +18,7 @@ export const POST = async (req, res) => {
|
|
|
17
18
|
}
|
|
18
19
|
const eventBus = req.scope.resolve("eventBus");
|
|
19
20
|
await eventBus.emit({
|
|
20
|
-
name:
|
|
21
|
+
name: EVENTS.WORKSPACE_MEMBER_INVITED,
|
|
21
22
|
data: {
|
|
22
23
|
invitation_id: invitation.id,
|
|
23
24
|
workspace_id: invitation.workspace_id ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../src/api/admin/users/invitations/[inviteId]/resend/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../src/api/admin/users/invitations/[inviteId]/resend/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEjD,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAa,EAAE,EAAE;IACpD,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,yBAAyB,CAAQ,CAAA;QAC/D,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QAEtF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,EAAE,CAAC,CAAA;YACpE,OAAM;QACR,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACpC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,wCAAwC,EAAE,EAAE,CAAC,CAAA;YACtF,OAAM;QACR,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,gEAAgE,EAAE,EAAE,CAAC,CAAA;YAC9G,OAAM;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAQ,CAAA;QACrD,MAAM,QAAQ,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC,wBAAwB;YACrC,IAAI,EAAE;gBACJ,aAAa,EAAE,UAAU,CAAC,EAAE;gBAC5B,YAAY,EAAE,UAAU,CAAC,YAAY,IAAI,IAAI;gBAC7C,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,QAAQ;aACrC;SACF,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAElB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/invitations/[inviteId]/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/api/admin/users/invitations/[inviteId]/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIvC,eAAO,MAAM,MAAM,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,kBAanD,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
2
3
|
export const DELETE = async (req, res) => {
|
|
3
|
-
requireRoles(
|
|
4
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
4
5
|
const svc = req.scope.resolve("invitationModuleService");
|
|
5
6
|
const invitation = await svc.retrieveInvitation(req.params.inviteId).catch(() => null);
|
|
6
7
|
if (!invitation) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/invitations/[inviteId]/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../src/api/admin/users/invitations/[inviteId]/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAa,EAAE,EAAE;IACtD,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,yBAAyB,CAAQ,CAAA;QAE/D,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;QACtF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,EAAE,CAAC,CAAA;YACpE,OAAM;QACR,CAAC;QAED,MAAM,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/invitations/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/invitations/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIvC,eAAO,MAAM,GAAG,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,kBAgDhD,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { ROLES } from "@meridianjs/types";
|
|
2
3
|
export const GET = async (req, res) => {
|
|
3
|
-
requireRoles(
|
|
4
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
4
5
|
const invitationService = req.scope.resolve("invitationModuleService");
|
|
5
6
|
const workspaceService = req.scope.resolve("workspaceModuleService");
|
|
6
7
|
const limit = Math.min(Number(req.query.limit) || 20, 100);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/invitations/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/invitations/route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/invite/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/invite/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAIrD,eAAO,MAAM,IAAI,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA4DrE,CAAA"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { requireRoles } from "@meridianjs/auth";
|
|
2
|
+
import { EVENTS, ROLES } from "@meridianjs/types";
|
|
2
3
|
export const POST = async (req, res, next) => {
|
|
3
|
-
requireRoles(
|
|
4
|
+
requireRoles(ROLES.SUPER_ADMIN, ROLES.ADMIN)(req, res, async () => {
|
|
4
5
|
try {
|
|
5
6
|
const invitationService = req.scope.resolve("invitationModuleService");
|
|
6
|
-
const { email, role =
|
|
7
|
+
const { email, role = ROLES.MEMBER } = req.body;
|
|
7
8
|
if (!email || typeof email !== "string") {
|
|
8
9
|
res.status(400).json({ error: { message: "email is required" } });
|
|
9
10
|
return;
|
|
10
11
|
}
|
|
11
|
-
if (![
|
|
12
|
+
if (![ROLES.SUPER_ADMIN, ROLES.ADMIN, ROLES.MEMBER].includes(role)) {
|
|
12
13
|
res.status(400).json({ error: { message: "role must be 'super-admin', 'admin', or 'member'" } });
|
|
13
14
|
return;
|
|
14
15
|
}
|
|
@@ -34,7 +35,7 @@ export const POST = async (req, res, next) => {
|
|
|
34
35
|
});
|
|
35
36
|
const eventBus = req.scope.resolve("eventBus");
|
|
36
37
|
eventBus.emit({
|
|
37
|
-
name:
|
|
38
|
+
name: EVENTS.WORKSPACE_MEMBER_INVITED,
|
|
38
39
|
data: {
|
|
39
40
|
invitation_id: invitation.id,
|
|
40
41
|
workspace_id: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/invite/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../src/api/admin/users/invite/route.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/map/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../src/api/admin/users/map/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAKrD;;;;GAIG;AACH,eAAO,MAAM,GAAG,GAAU,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA2CpE,CAAA"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isGlobalAdmin } from "../../../utils/project-access.js";
|
|
1
2
|
/**
|
|
2
3
|
* Lightweight endpoint that returns users with only the fields needed
|
|
3
4
|
* for lookup maps and dropdowns. Scoped to accessible workspaces for
|
|
@@ -6,9 +7,8 @@
|
|
|
6
7
|
export const GET = async (req, res, next) => {
|
|
7
8
|
try {
|
|
8
9
|
const userService = req.scope.resolve("userModuleService");
|
|
9
|
-
const roles = req.user?.roles ?? [];
|
|
10
10
|
const permissions = req.user?.permissions ?? [];
|
|
11
|
-
const isPrivileged =
|
|
11
|
+
const isPrivileged = isGlobalAdmin(req) || permissions.includes("workspace:admin");
|
|
12
12
|
let users;
|
|
13
13
|
if (isPrivileged) {
|
|
14
14
|
users = await userService.listUsers({});
|
|
@@ -17,13 +17,13 @@ export const GET = async (req, res, next) => {
|
|
|
17
17
|
const workspaceMemberService = req.scope.resolve("workspaceMemberModuleService");
|
|
18
18
|
const accessibleWsIds = await workspaceMemberService.getWorkspaceIdsForUser(req.user?.id);
|
|
19
19
|
if (accessibleWsIds.length === 0) {
|
|
20
|
-
res.json({ users: [] });
|
|
20
|
+
res.json({ users: [], count: 0 });
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
const wsMembers = await workspaceMemberService.listWorkspaceMembers({ workspace_id: accessibleWsIds.length === 1 ? accessibleWsIds[0] : accessibleWsIds });
|
|
24
24
|
const userIds = [...new Set(wsMembers.map((m) => m.user_id))];
|
|
25
25
|
if (userIds.length === 0) {
|
|
26
|
-
res.json({ users: [] });
|
|
26
|
+
res.json({ users: [], count: 0 });
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
29
|
const userMap = await userService.listUsersByIds(userIds);
|
|
@@ -35,8 +35,11 @@ export const GET = async (req, res, next) => {
|
|
|
35
35
|
first_name: u.first_name,
|
|
36
36
|
last_name: u.last_name,
|
|
37
37
|
avatar_url: u.avatar_url ?? null,
|
|
38
|
+
// Deactivated users stay in the payload — name lookups on historical
|
|
39
|
+
// data need them — but expose the flag so pickers can hide them.
|
|
40
|
+
is_active: u.is_active !== false,
|
|
38
41
|
}));
|
|
39
|
-
res.json({ users: mapped });
|
|
42
|
+
res.json({ users: mapped, count: mapped.length });
|
|
40
43
|
}
|
|
41
44
|
catch (err) {
|
|
42
45
|
next(err);
|