Skip to content

Commit 48e8110

Browse files
committed
Fixes bug with custom domain not working
1 parent bfdcaa8 commit 48e8110

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

server/middleware/status/defaultPage.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import { deleteCookie } from '../../../shared/utils/cookies.js';
22
import { cleanStatusPage } from '../../class/status.js';
33
import { userSessionExists } from '../../database/queries/session.js';
4-
import { fetchStatusPageUsingUrl } from '../../database/queries/status.js';
54
import { getUserByEmail } from '../../database/queries/user.js';
5+
import { fetchStatusPageUsingIdOrDomain } from '../../routes/statusApi.js';
66

77
const defaultPageMiddleware = async (request, response, next) => {
88
try {
9-
const statusPage = await fetchStatusPageUsingUrl('default');
9+
const statusPage = await fetchStatusPageUsingIdOrDomain(
10+
'default',
11+
request.headers.host
12+
);
1013

1114
if (!statusPage) {
1215
return response.redirect('/home');

server/middleware/status/statusPageUsingId.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { deleteCookie } from '../../../shared/utils/cookies.js';
22
import { cleanStatusPage } from '../../class/status.js';
33
import { userSessionExists } from '../../database/queries/session.js';
4-
import { fetchStatusPageUsingUrl } from '../../database/queries/status.js';
54
import { getUserByEmail } from '../../database/queries/user.js';
5+
import { fetchStatusPageUsingIdOrDomain } from '../../routes/statusApi.js';
66

77
const getStatusPageUsingIdMiddleware = async (request, response, next) => {
88
try {
@@ -12,7 +12,10 @@ const getStatusPageUsingIdMiddleware = async (request, response, next) => {
1212
return response.redirect('/');
1313
}
1414

15-
const statusPage = await fetchStatusPageUsingUrl(statusPageId);
15+
const statusPage = await fetchStatusPageUsingIdOrDomain(
16+
statusPageId,
17+
request.headers.host
18+
);
1619

1720
if (!statusPage) {
1821
return response.redirect('/404');

server/routes/statusApi.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import statusCache from '../cache/status.js';
99
import { userSessionExists } from '../database/queries/session.js';
1010
import { getUserByEmail } from '../database/queries/user.js';
1111

12-
const fetchStatusPage = async (statusPageId, domain) => {
12+
export const fetchStatusPageUsingIdOrDomain = async (statusPageId, domain) => {
1313
let statusPage = await fetchStatusPageUsingUrl(statusPageId);
1414

1515
if (!statusPage && domain) {
@@ -29,7 +29,10 @@ router.get('/', async (request, response) => {
2929
return response.status(400).json({ message: 'statusPageId is required' });
3030
}
3131

32-
const status = await fetchStatusPage(statusPageId, request.headers.host);
32+
const status = await fetchStatusPageUsingIdOrDomain(
33+
statusPageId,
34+
request.headers.host
35+
);
3336

3437
if (!status) {
3538
return response.status(404).json({ message: 'status not found' });

0 commit comments

Comments
 (0)