refactor: custom 404 page

namecheap · Dec 16, 2021 · 503ada9 · 503ada9
1 parent f618320
commit 503ada9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 25 deletions.
diff --git a/src/app/index.ts b/src/app/index.ts
@@ -42,7 +42,6 @@ import { IlcIntl } from './IlcIntl';
 import defaultIntlAdapter from './defaultIntlAdapter';
 import { IIlcAppSdk } from './interfaces/IIlcAppSdk';
 import { Render404 } from './interfaces/common';
-import ResponseStatus from './interfaces/ResponseStatus';
 
 export * from './types';
 export * from './GlobalBrowserApi';
@@ -87,16 +86,7 @@ export default class IlcAppSdk implements IIlcAppSdk {
  render404: Render404 = (isCustomPage) => {
  // SSR
  if (this.adapter.setStatus) {
- const status: ResponseStatus = {
- code: 404,
- };
-
- if (isCustomPage) {
- status.headers = {
- ['X-ILC-Override']: 'error-page-content',
- };
- }
- this.adapter.setStatus(status);
+ this.adapter.setStatus(404, isCustomPage);
  return;
  }
 

diff --git a/src/app/interfaces/ResponseStatus.ts b/src/app/interfaces/ResponseStatus.ts
@@ -1,5 +1,5 @@
 type ResponseStatus = {
- code?: number;
+ code: number;
  headers?: Record<string, string>;
 };
 

diff --git a/src/app/interfaces/common.ts b/src/app/interfaces/common.ts
@@ -29,7 +29,7 @@ export interface AppSdkAdapter {
  /** Unique application ID, if same app will be rendered twice on a page - it will get different IDs */
  appId: string;
  intl: IntlAdapter | null;
- setStatus: (data: ResponseStatus) => void;
+ setStatus: (code: number, isCustomPage?: boolean) => void;
  getStatus: () => ResponseStatus | undefined;
 }
 

diff --git a/src/server/IlcSdk.ts b/src/server/IlcSdk.ts
@@ -66,8 +66,14 @@ export class IlcSdk {
  getCurrentPathProps: () => passedProps,
  appId,
  intl: this.parseIntl(req),
- setStatus: (status) => {
- responseStatus = status;
+ setStatus: (code, isCustomPage) => {
+ responseStatus = { code };
+
+ if (isCustomPage) {
+ responseStatus.headers = {
+ ['X-ILC-Override']: 'error-page-content',
+ };
+ }
  },
  getStatus: () => responseStatus,
  };

diff --git a/test/server/IlcSdk.spec.ts b/test/server/IlcSdk.spec.ts
@@ -299,31 +299,24 @@ describe('IlcSdk', () => {
  const res = new MockRes();
 
  const pRes = ilcSdk.processRequest(req);
- pRes.setStatus({ code: NotFound });
+ pRes.setStatus(NotFound);
  ilcSdk.processResponse(pRes, res);
 
  expect(res.statusCode).to.eq(NotFound);
  });
 
  it('should set 404 status code and header for custom error', () => {
  const NotFound = 404;
- const NotFoundHeaderKey = 'X-ILC-Override';
- const NotFoundHeaderValue = 'error-page-content';
 
  const req = new MockReq(merge({}, defReq));
  const res = new MockRes();
 
  const pRes = ilcSdk.processRequest(req);
- pRes.setStatus({
- code: NotFound,
- headers: {
- [NotFoundHeaderKey]: NotFoundHeaderValue,
- },
- });
+ pRes.setStatus(NotFound, true);
  ilcSdk.processResponse(pRes, res);
 
  expect(res.statusCode).to.eq(NotFound);
- expect(res.getHeader(NotFoundHeaderKey)).to.eq(NotFoundHeaderValue);
+ expect(res.getHeader('X-ILC-Override')).to.eq('error-page-content');
  });
 
  describe('appAssets', () => {