Response class is missing status code property #3218

enonic · Aug 10, 2023 · 9d1b7aa · 9d1b7aa
1 parent ca0b4c8
commit 9d1b7aa
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/src/main/resources/assets/admin/common/js/rest/JsonResponse.ts b/src/main/resources/assets/admin/common/js/rest/JsonResponse.ts
@@ -5,8 +5,8 @@ export class JsonResponse<RAW_JSON_TYPE>
 
     readonly json: any;
 
-    constructor(data: any) {
-        super(data);
+    constructor(data: any, status?: number) {
+        super(data, status);
         this.json = JSON.parse(data);
     }
 

diff --git a/src/main/resources/assets/admin/common/js/rest/Request.ts b/src/main/resources/assets/admin/common/js/rest/Request.ts
@@ -4,6 +4,7 @@ import {Path} from './Path';
 import {RequestError} from './RequestError';
 import {HttpMethod} from './HttpMethod';
 import {Response} from './Response';
+import {StatusCode} from './StatusCode';
 
 export abstract class Request {
 
@@ -43,11 +44,11 @@ export abstract class Request {
             if (this.request.readyState === 4) {
                 let errorJson = null;
 
-                if (this.request.status === 204) {
+                if (this.request.status === StatusCode.NO_CONTENT) {
                     deferred.resolve(null);
-                } else if (this.request.status >= 200 && this.request.status < 300) {
+                } else if (this.request.status >= StatusCode.OK && this.request.status < StatusCode.MULTIPLE_OPTIONS) {
                     deferred.resolve(this.request.response);
-                } else if (this.request.status === 403) {
+                } else if (this.request.status === StatusCode.FORBIDDEN) {
                     deferred.reject(new AccessDeniedException('Access denied'));
                 } else {
                     try {
@@ -73,11 +74,14 @@ export abstract class Request {
     }
 
     send(): Q.Promise<Response> {
-
         this.prepareRequest();
         return this.sendRequest();
     }
 
+    getStatus(): number {
+        return this.request.status;
+    }
+
     protected createRequestData(): any {
         return null;
     }

diff --git a/src/main/resources/assets/admin/common/js/rest/ResourceRequest.ts b/src/main/resources/assets/admin/common/js/rest/ResourceRequest.ts
@@ -88,7 +88,7 @@ export abstract class ResourceRequest<PARSED_TYPE>
             .setTimeout(!this.heavyOperation ? this.timeoutMillis : 0);
 
         return request.send().then((rawResponse: any) => {
-            return this.isJsonResponse ? new JsonResponse(rawResponse) : new Response(rawResponse);
+            return this.isJsonResponse ? new JsonResponse(rawResponse, request.getStatus()) : new Response(rawResponse, request.getStatus());
         });
     }
 

diff --git a/src/main/resources/assets/admin/common/js/rest/Response.ts b/src/main/resources/assets/admin/common/js/rest/Response.ts
@@ -2,8 +2,11 @@ export class Response {
 
     readonly data: any;
 
-    constructor(data: any) {
+    readonly status: number;
+
+    constructor(data: any, status?: number) {
         this.data = data;
+        this.status = status;
     }
 
     isBlank(): boolean {
@@ -17,4 +20,8 @@ export class Response {
     getResult(): any {
         return this.data;
     }
+
+    getStatus(): number {
+        return this.status;
+    }
 }
diff --git a/src/main/resources/assets/admin/common/js/rest/StatusCode.ts b/src/main/resources/assets/admin/common/js/rest/StatusCode.ts
@@ -1,5 +1,13 @@
 export class StatusCode {
 
+    public static OK: number = 200;
+    public static NO_CONTENT: number = 204;
+
+    public static MULTIPLE_OPTIONS: number = 300;
+    public static REDIRECT: number = 307;
+
+    public static FORBIDDEN: number = 403;
     public static NOT_FOUND: number = 404;
+    public static I_AM_A_TEAPOT: number = 418;
 
 }
diff --git a/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts b/src/main/resources/assets/admin/common/js/ui/uploader/UploaderEl.ts
@@ -25,6 +25,7 @@ import {UploadFailedEvent} from './UploadFailedEvent';
 import {KeyBindings} from '../KeyBindings';
 import {KeyBinding} from '../KeyBinding';
 import {KeyHelper} from '../KeyHelper';
+import {StatusCode} from '../../rest/StatusCode';
 
 export interface FineUploaderFile {
     id: number;
@@ -858,7 +859,7 @@ export class UploaderEl<MODEL extends Equitable>
     }
 
     private fileCompleteCallback(id: number, _name: string, response: any, xhrOrXdr: XMLHttpRequest) {
-        if (xhrOrXdr && xhrOrXdr.status === 200) {
+        if (xhrOrXdr && xhrOrXdr.status === StatusCode.OK) {
             try {
                 const uploadItem = this.findUploadItemById(id);
                 if (uploadItem) {
@@ -878,7 +879,7 @@ export class UploaderEl<MODEL extends Equitable>
     }
 
     private errorCallback(id: number, name: string, _errorReason: any, xhrOrXdr: XMLHttpRequest) {
-        if (xhrOrXdr && xhrOrXdr.status !== 200) {
+        if (xhrOrXdr && xhrOrXdr.status !== StatusCode.OK) {
             try {
                 const responseObj = JSON.parse(xhrOrXdr.response);
                 const error = new RequestError(responseObj.status, responseObj.message);