Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
110 changes: 96 additions & 14 deletions backend/routes/adminRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@ const { randomUUID } = require('crypto');
const router = express.Router();
const { verifyToken, authorizeRoles } = require('../middlewares/verifyToken');
const { requireAdmin } = require('../middlewares/requireAdmin');
const { requirePlatformAdmin } = require('../middlewares/requirePlatformAdmin');
const mongoose = require('mongoose');
const { connectToDatabase } = require('../connectionsManager');
const { getConnections, disconnectSocket, disconnectAll } = require('../socket');
const { createSession } = require('../utilities/sessionUtils');
const { getCookieDomain } = require('../utilities/cookieUtils');
const getGlobalModels = require('../services/getGlobalModelService');
const {
listPlatformAdmins,
nominatePlatformAdmin,
approvePlatformAdminInvite,
revokePlatformAdminInvite,
} = require('../services/platformAdminInviteService');
const {
DEFAULT_TENANTS,
normalizeTenantRows,
Expand Down Expand Up @@ -242,30 +249,105 @@ router.get('/admin/user/:userId/analytics', verifyToken, requireAdmin, async (re
});

/**
* GET /admin/platform-admins – list platform admins (GlobalUsers with platform_admin role)
* GET /admin/platform-admins – list active platform admins + open nominations
* Response: { admins, nominations } (also accepts legacy clients that only read data as array — see note).
* Platform Admin UI uses this shape; campus Admin page still works if it reads data.admins || data.
*/
router.get('/admin/platform-admins', verifyToken, requireAdmin, async (req, res) => {
try {
const { PlatformRole, GlobalUser } = getGlobalModels(req, 'PlatformRole', 'GlobalUser');
const roles = await PlatformRole.find({ roles: 'platform_admin' }).lean();
const globalUserIds = roles.map(r => r.globalUserId);
const users = await GlobalUser.find({ _id: { $in: globalUserIds } }).select('email name picture createdAt').lean();
const byId = users.reduce((acc, u) => { acc[u._id.toString()] = u; return acc; }, {});
const list = roles.map(r => ({
globalUserId: r.globalUserId,
email: byId[r.globalUserId.toString()]?.email,
name: byId[r.globalUserId.toString()]?.name,
picture: byId[r.globalUserId.toString()]?.picture,
}));
res.json({ success: true, data: list });
const data = await listPlatformAdmins(req);
res.json({ success: true, data });
} catch (err) {
console.error('GET /admin/platform-admins failed:', err);
res.status(500).json({ success: false, message: err.message });
}
});

/**
* POST /admin/platform-admins – add platform admin by email or globalUserId
* POST /admin/platform-admins/nominate – nominate by email (no live role until Approve)
* Body: { email: string }
*/
router.post(
'/admin/platform-admins/nominate',
verifyToken,
requirePlatformAdmin,
async (req, res) => {
try {
const result = await nominatePlatformAdmin(req, { email: req.body?.email });
if (result.error) {
return res.status(result.status || 400).json({
success: false,
message: result.error,
code: result.code,
});
}
return res.status(200).json({ success: true, data: result.data });
} catch (err) {
console.error('POST /admin/platform-admins/nominate failed:', err);
return res.status(500).json({ success: false, message: err.message });
}
},
);

/**
* POST /admin/platform-admins/nominations/:inviteId/approve – grant platform_admin
*/
router.post(
'/admin/platform-admins/nominations/:inviteId/approve',
verifyToken,
requirePlatformAdmin,
async (req, res) => {
try {
const result = await approvePlatformAdminInvite(req, {
inviteId: req.params.inviteId,
});
if (result.error) {
return res.status(result.status || 400).json({
success: false,
message: result.error,
code: result.code,
});
}
console.log(
`Platform admin approved: ${result.data.email} by ${req.user.userId || req.user.globalUserId}`,
);
return res.status(200).json({ success: true, data: result.data });
} catch (err) {
console.error('POST /admin/platform-admins/nominations/:inviteId/approve failed:', err);
return res.status(500).json({ success: false, message: err.message });
}
},
);

/**
* DELETE /admin/platform-admins/nominations/:inviteId – cancel open nomination
*/
router.delete(
'/admin/platform-admins/nominations/:inviteId',
verifyToken,
requirePlatformAdmin,
async (req, res) => {
try {
const result = await revokePlatformAdminInvite(req, {
inviteId: req.params.inviteId,
});
if (result.error) {
return res.status(result.status || 400).json({
success: false,
message: result.error,
code: result.code,
});
}
return res.status(200).json({ success: true, data: result.data });
} catch (err) {
console.error('DELETE /admin/platform-admins/nominations/:inviteId failed:', err);
return res.status(500).json({ success: false, message: err.message });
}
},
);

/**
* POST /admin/platform-admins – add platform admin by email or globalUserId (legacy campus Admin)
* Body: { email?: string, globalUserId?: string }
*/
router.post('/admin/platform-admins', verifyToken, requireAdmin, async (req, res) => {
Expand Down
77 changes: 77 additions & 0 deletions backend/routes/pivotAdminRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const {
wipeUserWeekIntents,
} = require('../services/pivotTenantJourneyService');
const { getTenantOpsBundle } = require('../services/pivotTenantOpsService');
const { getPivotExplorePreview } = require('../services/pivotExploreService');
const { getPivotRetention } = require('../services/pivotRetentionService');
const { listPivotLabEvents } = require('../services/pivotLabEventsService');
const {
Expand All @@ -53,6 +54,7 @@ const { listPivotTags, seedPivotTagCatalog } = require('../services/pivotTagCata
const {
suggestPivotEventTags,
suggestPivotEventTagsBatch,
suggestAndApplyPivotEventTags,
} = require('../services/pivotTagSuggestService');
const {
searchTmdbMovies,
Expand Down Expand Up @@ -286,6 +288,46 @@ router.get(
},
);

router.get(
'/tenants/:tenantKey/explore',
verifyToken,
requirePlatformAdmin,
async (req, res) => {
try {
const result = await getPivotExplorePreview(req, {
tenantKey: req.params.tenantKey,
batchWeek: req.query?.batchWeek,
limit: req.query?.limit,
offset: req.query?.offset,
tags: req.query?.tags,
night: req.query?.night,
friendsOnly: req.query?.friendsOnly,
excludePassed: req.query?.excludePassed,
q: req.query?.q,
sort: req.query?.sort,
});
if (result.error) {
return res.status(result.status || 400).json({
success: false,
message: result.error,
code: result.code,
});
}

return res.status(200).json({
success: true,
data: result.data,
});
} catch (err) {
logPivotRouteError('GET /admin/pivot/tenants/:tenantKey/explore', err, req);
return res.status(500).json({
success: false,
message: 'Unable to load explore preview.',
});
}
},
);

router.get(
'/tenants/:tenantKey/events/performance',
verifyToken,
Expand Down Expand Up @@ -1013,6 +1055,41 @@ router.post('/ingest/suggest-tags', verifyToken, requirePlatformAdmin, async (re
}
});

router.post(
'/ingest/suggest-and-apply-tags',
verifyToken,
requirePlatformAdmin,
async (req, res) => {
try {
const result = await suggestAndApplyPivotEventTags(req, {
tenantKey: req.body?.tenantKey,
eventIds: req.body?.eventIds,
onlyTagless: req.body?.onlyTagless,
concurrency: req.body?.concurrency,
});
if (result.error) {
return res.status(result.status || 400).json({
success: false,
message: result.error,
code: result.code,
data: result.data,
});
}

return res.status(200).json({
success: true,
data: result.data,
});
} catch (err) {
logPivotRouteError('POST /admin/pivot/ingest/suggest-and-apply-tags', err, req);
return res.status(500).json({
success: false,
message: 'Unable to suggest and apply pivot tags.',
});
}
},
);

router.get('/tmdb/search', verifyToken, requirePlatformAdmin, async (req, res) => {
try {
const result = await searchTmdbMovies({
Expand Down
Loading