1 files changed, 54 insertions, 31 deletions

diff --git a/catalog-ui/src/app/models/server-error-response.ts b/catalog-ui/src/app/models/server-error-response.ts
index 61d09af48b..247774ce2a 100644
--- a/catalog-ui/src/app/models/server-error-response.ts
+++ b/catalog-ui/src/app/models/server-error-response.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,9 +21,8 @@
 /**
  * Created by ngordon on 7/27/2017.
  */
-
-import { Response } from '@angular/http';
-import { SEVERITY, ServerErrors } from "../utils/constants";
+import { ServerErrors } from '../utils/constants';
+import '../utils/prototypes';
 
 export class ServerErrorResponse {
 
@@ -31,48 +30,72 @@ export class ServerErrorResponse {
     message: string;
     messageId: string;
     status: number;
-    severity: SEVERITY;
-
-    constructor(response?: Response) {
+    ecompRequestId: string;
 
+    constructor(response?: any, isNg1Response?: boolean) {
         if (response) {
-            let rejectionObj: any = {};
-            if (response.text().length) {
-                let rejection = response.json();
-                rejectionObj = rejection.serviceException || rejection.requestError && (rejection.requestError.serviceException || rejection.requestError.policyException);
-                rejectionObj.text = this.getFormattedMessage(rejectionObj.text || ServerErrors.MESSAGE_ERROR, rejectionObj.variables);
+            if (isNg1Response) {
+                // Shall handle the case where this error response is generated from the NG1 http interceptor
+                this.setValuesByRejectionObject(response, response.data);
+            } else {
+                // Shall handle NG5 http error responses
+                this.setValuesByRejectionObject(response, response.error);
             }
+        }
+    }
+
+    private setValuesByRejectionObject(response: any, errorResponseBody: any) {
+        let rejectionObj: any = {};
 
+        // If it is an internal server error, we dont want to expose anything to the user, just display a default error an return
+        if (response.status === 500) {
             this.title = ServerErrors.ERROR_TITLE;
-            this.message = rejectionObj.text || response.statusText || ServerErrors.DEFAULT_ERROR;
-            this.messageId = rejectionObj.messageId;
+            this.message = ServerErrors.DEFAULT_ERROR;
             this.status = response.status;
-            this.severity = SEVERITY.ERROR;
+            return;
         }
-    }
 
+        if (errorResponseBody) {
+            if (errorResponseBody.requestError || errorResponseBody.serviceException) {
+                rejectionObj = errorResponseBody.serviceException || errorResponseBody.requestError.serviceException || errorResponseBody.requestError.policyException;
+                rejectionObj.text = this.getFormattedMessage(rejectionObj.text || ServerErrors.MESSAGE_ERROR, rejectionObj.variables);
+            } else if (errorResponseBody.type === 'application/octet-stream') {
+                rejectionObj.text = 'Error downloading file';
+                rejectionObj.title = ServerErrors.DOWNLOAD_ERROR;
+            } else if (errorResponseBody.message) {
+                rejectionObj.text = response.error.message;
+            } else {
+                rejectionObj.text = response.error;
+            }
+        }
+        this.title = rejectionObj.title || ServerErrors.ERROR_TITLE;
+        this.message = rejectionObj.text || response.statusText || ServerErrors.DEFAULT_ERROR;
+        this.messageId = rejectionObj.messageId;
+        this.status = response.status;
+        this.ecompRequestId = rejectionObj.ecompRequestId;
+    }
 
-    private getFormattedMessage = (text: string, variables: Array<string>): string => { //OLD CODE
-        // Remove the "Error: " text at the begining
-        if (text.trim().indexOf("Error:") === 0) {
-            text = text.replace("Error:", "").trim();
+    private getFormattedMessage = (text: string, variables: string[]): string => {
+        // Remove the "Error: " text at the beginning
+        if (text.trim().indexOf('Error:') === 0) {
+            text = text.replace('Error:', '').trim();
         }
 
-        //mshitrit DE199895 bug fix
+        // mshitrit DE199895 bug fix
         let count: number = 0;
-        variables.forEach(function (item) {
+        variables.forEach( (item) => {
             variables[count] = item ? item.replace('<', '&lt').replace('>', '&gt') : '';
             count++;
         });
 
         // Format the message in case has array to <ul><li>
-        text = text.replace(/\[%(\d+)\]/g, function (_, m) {
-            let tmp = [];
-            let list = variables[--m].split(";");
-            list.forEach(function (item) {
-                tmp.push("<li>" + item + "</li>");
+        text = text.replace(/\[%(\d+)\]/g, (_, m) => {
+            const tmp = [];
+            const list = variables[--m].split(';');
+            list.forEach((item) => {
+                tmp.push('<li>' + item + '</li>');
             });
-            return "<ul>" + tmp.join("") + "</ul>";
+            return '<ul>' + tmp.join('') + '</ul>';
         });
 
         // Format the message %1 %2
@@ -80,5 +103,5 @@ export class ServerErrorResponse {
 
         return text;
 
-    };
-}
\ No newline at end of file
+    }
+}