fix: handling status codes

namecheap · Dec 8, 2021 · 934d615 · 934d615
1 parent cbd13ab
commit 934d615
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/src/app/index.ts b/src/app/index.ts
@@ -72,16 +72,20 @@ export default class IlcAppSdk implements IIlcAppSdk {
         const intlAdapter = this.adapter.intl ? this.adapter.intl : defaultIntlAdapter;
         this.intl = new IlcIntl(this.appId, intlAdapter);
     }
-
+    /**
+     * Isomorphic method to render 404 page.
+     * At SSR in processResponse it sets 404 status code to response.
+     * At CSR it triggers global event which ILC listens and renders 404 page.
+     */
     render404 = () => {
-        if (typeof window !== 'undefined') {
+        if (this.adapter.setStatusCode) {
+            this.adapter.setStatusCode(404);
+        } else {
             window.dispatchEvent(
                 new CustomEvent('ilc:404', {
                     detail: { appId: this.appId },
                 }),
             );
-        } else {
-            this.adapter._is404 = true;
         }
     };
 

diff --git a/src/app/interfaces/common.ts b/src/app/interfaces/common.ts
@@ -27,8 +27,8 @@ 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;
-    /** Uses in "processResponse" to set 404 status code */
-    _is404: boolean;
+    setStatusCode: (code: number) => void;
+    getStatusCode: () => number | undefined;
 }
 
 export type Render404 = () => void;

diff --git a/src/server/IlcSdk.ts b/src/server/IlcSdk.ts
@@ -55,6 +55,8 @@ export class IlcSdk {
             originalUri = '/';
         }
 
+        let statusCode: number | undefined;
+
         return {
             getCurrentReqHost: () => host,
             getCurrentReqUrl: () => requestedUrls.requestUrl,
@@ -63,7 +65,10 @@ export class IlcSdk {
             getCurrentPathProps: () => passedProps,
             appId,
             intl: this.parseIntl(req),
-            _is404: false,
+            setStatusCode: (code) => {
+                statusCode = code;
+            },
+            getStatusCode: () => statusCode,
         };
     }
 
@@ -73,8 +78,9 @@ export class IlcSdk {
      * **WARNING:** this method should be called before response headers were send.
      */
     public processResponse(reqData: types.RequestData, res: ServerResponse, data?: types.ResponseData): void {
-        if (reqData._is404) {
-            res.statusCode = 404;
+        const statusCode = reqData.getStatusCode();
+        if (statusCode) {
+            res.statusCode = statusCode;
         }
 
         if (!data) {

diff --git a/test/server/IlcSdk.spec.ts b/test/server/IlcSdk.spec.ts
@@ -293,14 +293,16 @@ describe('IlcSdk', () => {
         });
 
         it('should set 404 status code', () => {
+            const NotFound = 404;
+
             const req = new MockReq(merge({}, defReq));
             const res = new MockRes();
 
             const pRes = ilcSdk.processRequest(req);
-            pRes._is404 = true;
+            pRes.setStatusCode(NotFound);
             ilcSdk.processResponse(pRes, res);
 
-            expect(res.statusCode).to.eq(404);
+            expect(res.statusCode).to.eq(NotFound);
         });
 
         describe('appAssets', () => {