Page MenuHomePhabricator
Differential D3551

[server] Use separate Express router for landing page
ClosedPublic
Actions

Authored by ashoat on Mar 29 2022, 3:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 10:27 PM
Unknown Object (File)
Mon, Mar 31, 1:19 PM
Unknown Object (File)
Sun, Mar 30, 9:18 PM
Unknown Object (File)
Sun, Mar 30, 1:24 PM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:31 PM
View All Files
Subscribers
• abosh
• adrian
• benschac
• karol

Details

Reviewers
varun
atul
tomek
Commits
rCOMM36d3c9543a04: [server] Use separate Express router for landing page
Summary

This diff also makes us no longer needs server/facts/url.json. The baseRoutePath that was there was ostensibly a global one, but if we have distinct routers for each "app", we don't need a global baseRoutePath anymore.

Depends on D3550

Test Plan
  1. We tested the landing page, the SquadCal app, and the Comm app
  2. We made sure we tried configs where baseRoutePath !== basePath
  3. We also checked view-source to make sure things were set correctly
  4. We made sure there were no errors in the browser console
  5. We played around with the site, logging in and navigating and making sure things worked correctly
  6. We tried loading a specific URL for a specific chat directly

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Mar 29 2022, 3:25 PM
Herald added subscribers: • abosh, • benschac, • karol, • adrian. · View Herald TranscriptMar 29 2022, 3:25 PM
ashoat added a child revision: D3552: [server] Use same Router config for web.comm.app that we use for squadcal.org.Mar 29 2022, 3:26 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Mar 29 2022, 3:35 PM
Harbormaster failed remote builds in B7697: Diff 10799!
Harbormaster completed remote builds in B7697: Diff 10799.Mar 30 2022, 10:57 AM
ashoat requested review of this revision.Mar 30 2022, 10:57 AM
varun accepted this revision.Mar 30 2022, 11:01 AM
varun added inline comments.
server/src/database/migrations.js
44–46 ↗(On Diff #10799)

unlink is wrapped in a try-catch so that the migration is idempotent

This revision is now accepted and ready to land.Mar 30 2022, 11:01 AM
Closed by commit rCOMM36d3c9543a04: [server] Use separate Express router for landing page (authored by ashoat). · Explain WhyMar 30 2022, 11:15 AM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM36d3c9543a04: [server] Use separate Express router for landing page.

Revision Contents
Changeset List

PathSize
server/
src/
database/
8 lines
60 lines
utils/
10 lines

Diff 10835

View Options

server/src/database/migrations.js

Show All 30 Lines): Promise<FetchServerThreadInfosResult> {
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions
FROM threads t FROM threads t
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`.append(whereClause); `.append(whereClause);
const threadsQuery = SQL` const threadsQuery = SQL`
SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id, SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id,
t.community, t.depth, t.color, t.description, t.type, t.creation_time, t.community, t.depth, t.color, t.description, t.type, t.creation_time,
t.source_message, t.replies_count, t.avatar, m.user, m.role, m.permissions, t.source_message, t.replies_count, t.avatar, t.pinned_count, m.user,
m.subscription, m.last_read_message < m.last_message AS unread, m.sender m.role, m.permissions, m.subscription,
m.last_read_message < m.last_message AS unread, m.sender
FROM threads t FROM threads t
LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0 LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0
` `
.append(whereClause) .append(whereClause)
.append(SQL` ORDER BY m.user ASC`); .append(SQL` ORDER BY m.user ASC`);
const [[threadsResult], [rolesResult]] = await Promise.all([ const [[threadsResult], [rolesResult]] = await Promise.all([
dbQuery(threadsQuery), dbQuery(threadsQuery),
dbQuery(rolesQuery), dbQuery(rolesQuery),
]); ]);
Show All 16 Lines if (!threadInfos[threadID]) {
: null, : null,
depth: threadsRow.depth, depth: threadsRow.depth,
community: threadsRow.community community: threadsRow.community
? threadsRow.community.toString() ? threadsRow.community.toString()
: null, : null,
members: [], members: [],
roles: {}, roles: {},
repliesCount: threadsRow.replies_count, repliesCount: threadsRow.replies_count,
pinnedCount: threadsRow.pinned_count,
}; };
if (threadsRow.avatar) { if (threadsRow.avatar) {
threadInfos[threadID] = { threadInfos[threadID] = {
...threadInfos[threadID], ...threadInfos[threadID],
avatar: JSON.parse(threadsRow.avatar), avatar: JSON.parse(threadsRow.avatar),
}; };
} }
} }
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines const hasCodeVersionBelow104 = !hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
104, 104,
); );
// TODO (atul): Replace with `hasMinCodeVersion` check once we have a // TODO (atul): Replace with `hasMinCodeVersion` check once we have a
// native release with thread avatar editing enabled. // native release with thread avatar editing enabled.
const filterThreadEditAvatarPermission = true; const filterThreadEditAvatarPermission = true;
const hasCodeVersionBelow209 = !hasMinCodeVersion(
viewer.platformDetails,
209,
);
const threadInfos = {}; const threadInfos = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
includeVisibilityRules: hasCodeVersionBelow70, includeVisibilityRules: hasCodeVersionBelow70,
filterMemberList: hasCodeVersionBelow70, filterMemberList: hasCodeVersionBelow70,
shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null, shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null,
hideThreadStructure: hasCodeVersionBelow102, hideThreadStructure: hasCodeVersionBelow102,
filterDetailedThreadEditPermissions: hasCodeVersionBelow104, filterDetailedThreadEditPermissions: hasCodeVersionBelow104,
filterThreadEditAvatarPermission, filterThreadEditAvatarPermission,
excludePinInfo: hasCodeVersionBelow209,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines
View Options

server/src/server.js

Show All 30 Lines): Promise<FetchServerThreadInfosResult> {
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions
FROM threads t FROM threads t
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`.append(whereClause); `.append(whereClause);
const threadsQuery = SQL` const threadsQuery = SQL`
SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id, SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id,
t.community, t.depth, t.color, t.description, t.type, t.creation_time, t.community, t.depth, t.color, t.description, t.type, t.creation_time,
t.source_message, t.replies_count, t.avatar, m.user, m.role, m.permissions, t.source_message, t.replies_count, t.avatar, t.pinned_count, m.user,
m.subscription, m.last_read_message < m.last_message AS unread, m.sender m.role, m.permissions, m.subscription,
m.last_read_message < m.last_message AS unread, m.sender
FROM threads t FROM threads t
LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0 LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0
` `
.append(whereClause) .append(whereClause)
.append(SQL` ORDER BY m.user ASC`); .append(SQL` ORDER BY m.user ASC`);
const [[threadsResult], [rolesResult]] = await Promise.all([ const [[threadsResult], [rolesResult]] = await Promise.all([
dbQuery(threadsQuery), dbQuery(threadsQuery),
dbQuery(rolesQuery), dbQuery(rolesQuery),
]); ]);
Show All 16 Lines if (!threadInfos[threadID]) {
: null, : null,
depth: threadsRow.depth, depth: threadsRow.depth,
community: threadsRow.community community: threadsRow.community
? threadsRow.community.toString() ? threadsRow.community.toString()
: null, : null,
members: [], members: [],
roles: {}, roles: {},
repliesCount: threadsRow.replies_count, repliesCount: threadsRow.replies_count,
pinnedCount: threadsRow.pinned_count,
}; };
if (threadsRow.avatar) { if (threadsRow.avatar) {
threadInfos[threadID] = { threadInfos[threadID] = {
...threadInfos[threadID], ...threadInfos[threadID],
avatar: JSON.parse(threadsRow.avatar), avatar: JSON.parse(threadsRow.avatar),
}; };
} }
} }
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines const hasCodeVersionBelow104 = !hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
104, 104,
); );
// TODO (atul): Replace with `hasMinCodeVersion` check once we have a // TODO (atul): Replace with `hasMinCodeVersion` check once we have a
// native release with thread avatar editing enabled. // native release with thread avatar editing enabled.
const filterThreadEditAvatarPermission = true; const filterThreadEditAvatarPermission = true;
const hasCodeVersionBelow209 = !hasMinCodeVersion(
viewer.platformDetails,
209,
);
const threadInfos = {}; const threadInfos = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
includeVisibilityRules: hasCodeVersionBelow70, includeVisibilityRules: hasCodeVersionBelow70,
filterMemberList: hasCodeVersionBelow70, filterMemberList: hasCodeVersionBelow70,
shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null, shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null,
hideThreadStructure: hasCodeVersionBelow102, hideThreadStructure: hasCodeVersionBelow102,
filterDetailedThreadEditPermissions: hasCodeVersionBelow104, filterDetailedThreadEditPermissions: hasCodeVersionBelow104,
filterThreadEditAvatarPermission, filterThreadEditAvatarPermission,
excludePinInfo: hasCodeVersionBelow209,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines
View Options

server/src/utils/urls.js

Show All 30 Lines): Promise<FetchServerThreadInfosResult> {
const rolesQuery = SQL` const rolesQuery = SQL`
SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions SELECT t.id, t.default_role, r.id AS role, r.name, r.permissions
FROM threads t FROM threads t
LEFT JOIN roles r ON r.thread = t.id LEFT JOIN roles r ON r.thread = t.id
`.append(whereClause); `.append(whereClause);
const threadsQuery = SQL` const threadsQuery = SQL`
SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id, SELECT t.id, t.name, t.parent_thread_id, t.containing_thread_id,
t.community, t.depth, t.color, t.description, t.type, t.creation_time, t.community, t.depth, t.color, t.description, t.type, t.creation_time,
t.source_message, t.replies_count, t.avatar, m.user, m.role, m.permissions, t.source_message, t.replies_count, t.avatar, t.pinned_count, m.user,
m.subscription, m.last_read_message < m.last_message AS unread, m.sender m.role, m.permissions, m.subscription,
m.last_read_message < m.last_message AS unread, m.sender
FROM threads t FROM threads t
LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0 LEFT JOIN memberships m ON m.thread = t.id AND m.role >= 0
` `
.append(whereClause) .append(whereClause)
.append(SQL` ORDER BY m.user ASC`); .append(SQL` ORDER BY m.user ASC`);
const [[threadsResult], [rolesResult]] = await Promise.all([ const [[threadsResult], [rolesResult]] = await Promise.all([
dbQuery(threadsQuery), dbQuery(threadsQuery),
dbQuery(rolesQuery), dbQuery(rolesQuery),
]); ]);
Show All 16 Lines if (!threadInfos[threadID]) {
: null, : null,
depth: threadsRow.depth, depth: threadsRow.depth,
community: threadsRow.community community: threadsRow.community
? threadsRow.community.toString() ? threadsRow.community.toString()
: null, : null,
members: [], members: [],
roles: {}, roles: {},
repliesCount: threadsRow.replies_count, repliesCount: threadsRow.replies_count,
pinnedCount: threadsRow.pinned_count,
}; };
if (threadsRow.avatar) { if (threadsRow.avatar) {
threadInfos[threadID] = { threadInfos[threadID] = {
...threadInfos[threadID], ...threadInfos[threadID],
avatar: JSON.parse(threadsRow.avatar), avatar: JSON.parse(threadsRow.avatar),
}; };
} }
} }
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines const hasCodeVersionBelow104 = !hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
104, 104,
); );
// TODO (atul): Replace with `hasMinCodeVersion` check once we have a // TODO (atul): Replace with `hasMinCodeVersion` check once we have a
// native release with thread avatar editing enabled. // native release with thread avatar editing enabled.
const filterThreadEditAvatarPermission = true; const filterThreadEditAvatarPermission = true;
const hasCodeVersionBelow209 = !hasMinCodeVersion(
viewer.platformDetails,
209,
);
const threadInfos = {}; const threadInfos = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
includeVisibilityRules: hasCodeVersionBelow70, includeVisibilityRules: hasCodeVersionBelow70,
filterMemberList: hasCodeVersionBelow70, filterMemberList: hasCodeVersionBelow70,
shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null, shimThreadTypes: hasCodeVersionBelow87 ? shimCommunityRoot : null,
hideThreadStructure: hasCodeVersionBelow102, hideThreadStructure: hasCodeVersionBelow102,
filterDetailedThreadEditPermissions: hasCodeVersionBelow104, filterDetailedThreadEditPermissions: hasCodeVersionBelow104,
filterThreadEditAvatarPermission, filterThreadEditAvatarPermission,
excludePinInfo: hasCodeVersionBelow209,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines