@hmcts/ccpay-web-component 6.4.0 → 6.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,11 +19,11 @@ export class ErrorHandlerService {
|
|
|
19
19
|
// Attempt to parse error as JSON
|
|
20
20
|
const parsedError = typeof err.error === 'string' ? JSON.parse(err.error) : err.error;
|
|
21
21
|
if (parsedError) {
|
|
22
|
-
if (parsedError.
|
|
22
|
+
if (parsedError.status && parsedError.status === 500) {
|
|
23
23
|
errorMessage = 'Internal server error';
|
|
24
24
|
}
|
|
25
25
|
else if (parsedError.message) {
|
|
26
|
-
if (parsedError.error != undefined && parsedError.
|
|
26
|
+
if (parsedError.error != undefined && parsedError.status === 400) {
|
|
27
27
|
errorMessage = parsedError.error;
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
@@ -33,16 +33,8 @@ export class ErrorHandlerService {
|
|
|
33
33
|
else if (parsedError.error) {
|
|
34
34
|
errorMessage = parsedError.error;
|
|
35
35
|
}
|
|
36
|
-
else {
|
|
37
|
-
|
|
38
|
-
const match = parsedError.err.match(errorMessagePattern);
|
|
39
|
-
if (match && match[1]) {
|
|
40
|
-
errorMessage = match[1];
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
// Fallback in case the pattern does not match
|
|
44
|
-
errorMessage = err.error;
|
|
45
|
-
}
|
|
36
|
+
else if (parsedError.err != null) {
|
|
37
|
+
errorMessage = parsedError.err;
|
|
46
38
|
}
|
|
47
39
|
}
|
|
48
40
|
else {
|
|
@@ -81,4 +73,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
81
73
|
providedIn: 'root'
|
|
82
74
|
}]
|
|
83
75
|
}], ctorParameters: () => [] });
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3ItaGFuZGxlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvcGF5bWVudC1saWIvc3JjL2xpYi9zZXJ2aWNlcy9zaGFyZWQvZXJyb3ItaGFuZGxlci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQzs7QUFPOUMsTUFBTSxPQUFPLG1CQUFtQjtJQUU5QixnQkFBZ0IsQ0FBQztJQUVuQixXQUFXLENBQUMsR0FBc0I7UUFDaEMsSUFBSSxZQUFvQixDQUFDO1FBRXhCLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNOLE9BQU8sVUFBVSxDQUFDLDhCQUE4QixDQUFDLENBQUM7UUFDcEQsQ0FBQztRQUVMLHFEQUFxRDtRQUNyRCxJQUFJLEdBQUcsQ0FBQyxLQUFLLFlBQVksVUFBVSxFQUFFLENBQUM7WUFDcEMsWUFBWSxHQUFHLHNCQUFzQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQzNELENBQUM7YUFBTSxDQUFDO1lBQ04sNkNBQTZDO1lBQzdDLElBQUksR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQztnQkFDekYsSUFBSSxDQUFDO29CQUNILGlDQUFpQztvQkFDakMsTUFBTSxXQUFXLEdBQUcsT0FBTyxHQUFHLENBQUMsS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7b0JBQ3RGLElBQUcsV0FBVyxFQUFDLENBQUM7d0JBQ2QsSUFBSSxXQUFXLENBQUMsTUFBTSxJQUFJLFdBQVcsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7NEJBQ3JELFlBQVksR0FBRyx1QkFBdUIsQ0FBQzt3QkFDekMsQ0FBQzs2QkFBTSxJQUFJLFdBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FBQzs0QkFDN0IsSUFBRyxXQUFXLENBQUMsS0FBSyxJQUFHLFNBQVMsSUFBSSxXQUFXLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBQyxDQUFDO2dDQUM1RCxZQUFZLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQzs0QkFDckMsQ0FBQztpQ0FBSSxDQUFDO2dDQUNKLFlBQVksR0FBRyxXQUFXLENBQUMsT0FBTyxDQUFDOzRCQUNyQyxDQUFDO3dCQUNMLENBQUM7NkJBQU0sSUFBSSxXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7NEJBQzdCLFlBQVksR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDO3dCQUNuQyxDQUFDOzZCQUFNLElBQUcsV0FBVyxDQUFDLEdBQUcsSUFBRSxJQUFJLEVBQUUsQ0FBQzs0QkFDOUIsWUFBWSxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUM7d0JBQ25DLENBQUM7b0JBQ0gsQ0FBQzt5QkFBSSxDQUFDO3dCQUNKLFlBQVksR0FBRyw4QkFBOEIsQ0FBQztvQkFDaEQsQ0FBQztnQkFDSCxDQUFDO2dCQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7b0JBQ1gsNEJBQTRCO29CQUM1QixZQUFZLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDM0IsQ0FBQztZQUNILENBQUM7aUJBQU0sSUFBSSxHQUFHLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO2dCQUM5QixZQUFZLEdBQUcsdUJBQXVCLENBQUM7WUFDekMsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLDBDQUEwQztnQkFDMUMsWUFBWSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUM7WUFDaEQsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBTUMscUJBQXFCLENBQUMsWUFBWSxFQUFFLGNBQWMsR0FBRyxLQUFLLEVBQUUsS0FBSyxHQUFDLEVBQUU7UUFDbEUsTUFBTSxXQUFXLEdBQUcsY0FBYyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDO1FBQy9ELE9BQU87WUFDTCxLQUFLLEVBQUUscUNBQXFDO1lBQzVDLElBQUksRUFBRSxXQUFXO1lBQ2pCLFNBQVMsRUFBRSxZQUFZO1NBQ3hCLENBQUM7SUFDSixDQUFDO3dHQTlEVSxtQkFBbUI7NEdBQW5CLG1CQUFtQixjQUpsQixNQUFNOzs0RkFJUCxtQkFBbUI7a0JBTC9CLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSHR0cEVycm9yUmVzcG9uc2UgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuXG5cbmV4cG9ydCBjbGFzcyBFcnJvckhhbmRsZXJTZXJ2aWNlIHtcblxuICBjb25zdHJ1Y3RvcigpIHsgfVxuXG5oYW5kbGVFcnJvcihlcnI6IEh0dHBFcnJvclJlc3BvbnNlKTogT2JzZXJ2YWJsZTxhbnk+IHtcbiAgbGV0IGVycm9yTWVzc2FnZTogc3RyaW5nO1xuXG4gICBpZiAoIWVycikge1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcignQW4gdW5leHBlY3RlZCBlcnJvciBvY2N1cnJlZCcpO1xuICAgICAgfVxuXG4gIC8vIENoZWNrIGlmIHRoZSBlcnJvciBpcyBjbGllbnQtc2lkZSBvciBuZXR3b3JrIGVycm9yXG4gIGlmIChlcnIuZXJyb3IgaW5zdGFuY2VvZiBFcnJvckV2ZW50KSB7XG4gICAgZXJyb3JNZXNzYWdlID0gYEFuIGVycm9yIG9jY3VycmVkOiAke2Vyci5lcnJvci5tZXNzYWdlfWA7XG4gIH0gZWxzZSB7XG4gICAgLy8gQ2hlY2sgaWYgdGhlIGVycm9yIGlzIGZyb20gdGhlIHNlcnZlci1zaWRlXG4gICAgaWYgKGVyci5zdGF0dXMgPT09IDQwMCB8fCBlcnIuc3RhdHVzID09PSA0MDQgfHwgZXJyLnN0YXR1cyA9PT0gNTAwIHx8IGVyci5zdGF0dXMgPT09IDQxMikge1xuICAgICAgdHJ5IHtcbiAgICAgICAgLy8gQXR0ZW1wdCB0byBwYXJzZSBlcnJvciBhcyBKU09OXG4gICAgICAgIGNvbnN0IHBhcnNlZEVycm9yID0gdHlwZW9mIGVyci5lcnJvciA9PT0gJ3N0cmluZycgPyBKU09OLnBhcnNlKGVyci5lcnJvcikgOiBlcnIuZXJyb3I7XG4gICAgICAgIGlmKHBhcnNlZEVycm9yKXtcbiAgICAgICAgICBpZiAocGFyc2VkRXJyb3Iuc3RhdHVzICYmIHBhcnNlZEVycm9yLnN0YXR1cyA9PT0gNTAwKSB7XG4gICAgICAgICAgICBlcnJvck1lc3NhZ2UgPSAnSW50ZXJuYWwgc2VydmVyIGVycm9yJztcbiAgICAgICAgICB9IGVsc2UgaWYgKHBhcnNlZEVycm9yLm1lc3NhZ2UpIHtcbiAgICAgICAgICAgICAgaWYocGFyc2VkRXJyb3IuZXJyb3IgIT11bmRlZmluZWQgJiYgcGFyc2VkRXJyb3Iuc3RhdHVzID09PSA0MDApe1xuICAgICAgICAgICAgICAgICAgZXJyb3JNZXNzYWdlID0gcGFyc2VkRXJyb3IuZXJyb3I7XG4gICAgICAgICAgICAgIH1lbHNle1xuICAgICAgICAgICAgICAgIGVycm9yTWVzc2FnZSA9IHBhcnNlZEVycm9yLm1lc3NhZ2U7XG4gICAgICAgICAgICAgIH1cbiAgICAgICAgICB9IGVsc2UgaWYgKHBhcnNlZEVycm9yLmVycm9yKSB7XG4gICAgICAgICAgICBlcnJvck1lc3NhZ2UgPSBwYXJzZWRFcnJvci5lcnJvcjtcbiAgICAgICAgICB9IGVsc2UgaWYocGFyc2VkRXJyb3IuZXJyIT1udWxsKSB7XG4gICAgICAgICAgICAgIGVycm9yTWVzc2FnZSA9IHBhcnNlZEVycm9yLmVycjtcbiAgICAgICAgICB9XG4gICAgICAgIH1lbHNle1xuICAgICAgICAgIGVycm9yTWVzc2FnZSA9ICdBbiB1bmV4cGVjdGVkIGVycm9yIG9jY3VycmVkJztcbiAgICAgICAgfVxuICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAvLyBGYWxsYmFjayBpZiBwYXJzaW5nIGZhaWxzXG4gICAgICAgIGVycm9yTWVzc2FnZSA9IGVyci5lcnJvcjtcbiAgICAgIH1cbiAgICB9IGVsc2UgaWYgKGVyci5zdGF0dXMgPT09IDUwMCkge1xuICAgICAgZXJyb3JNZXNzYWdlID0gJ0ludGVybmFsIHNlcnZlciBlcnJvcic7XG4gICAgfSBlbHNlIHtcbiAgICAgIC8vIEdlbmVyYWwgZmFsbGJhY2sgZm9yIG90aGVyIHN0YXR1cyBjb2Rlc1xuICAgICAgZXJyb3JNZXNzYWdlID0gZXJyLmVycm9yLm1lc3NhZ2UgfHwgZXJyLmVycm9yO1xuICAgIH1cbiAgfVxuICByZXR1cm4gdGhyb3dFcnJvcihlcnJvck1lc3NhZ2UpO1xufVxuXG5cblxuXG5cbiAgZ2V0U2VydmVyRXJyb3JNZXNzYWdlKGlzRXJyb3JFeGlzdCwgaXNEYXRhTm90RXhpc3QgPSBmYWxzZSwgZXJyb3I9JycpIHtcbiAgICBjb25zdCBib2R5Q29udGVudCA9IGlzRGF0YU5vdEV4aXN0ID8gZXJyb3IgOiAnVHJ5IGFnYWluIGxhdGVyJztcbiAgICByZXR1cm4ge1xuICAgICAgdGl0bGU6IFwiVGhlcmUgaXMgYSBwcm9ibGVtIHdpdGggdGhlIHNlcnZpY2VcIixcbiAgICAgIGJvZHk6IGJvZHlDb250ZW50LFxuICAgICAgc2hvd0Vycm9yOiBpc0Vycm9yRXhpc3RcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -297,11 +297,11 @@ class ErrorHandlerService {
|
|
|
297
297
|
// Attempt to parse error as JSON
|
|
298
298
|
const parsedError = typeof err.error === 'string' ? JSON.parse(err.error) : err.error;
|
|
299
299
|
if (parsedError) {
|
|
300
|
-
if (parsedError.
|
|
300
|
+
if (parsedError.status && parsedError.status === 500) {
|
|
301
301
|
errorMessage = 'Internal server error';
|
|
302
302
|
}
|
|
303
303
|
else if (parsedError.message) {
|
|
304
|
-
if (parsedError.error != undefined && parsedError.
|
|
304
|
+
if (parsedError.error != undefined && parsedError.status === 400) {
|
|
305
305
|
errorMessage = parsedError.error;
|
|
306
306
|
}
|
|
307
307
|
else {
|
|
@@ -311,16 +311,8 @@ class ErrorHandlerService {
|
|
|
311
311
|
else if (parsedError.error) {
|
|
312
312
|
errorMessage = parsedError.error;
|
|
313
313
|
}
|
|
314
|
-
else {
|
|
315
|
-
|
|
316
|
-
const match = parsedError.err.match(errorMessagePattern);
|
|
317
|
-
if (match && match[1]) {
|
|
318
|
-
errorMessage = match[1];
|
|
319
|
-
}
|
|
320
|
-
else {
|
|
321
|
-
// Fallback in case the pattern does not match
|
|
322
|
-
errorMessage = err.error;
|
|
323
|
-
}
|
|
314
|
+
else if (parsedError.err != null) {
|
|
315
|
+
errorMessage = parsedError.err;
|
|
324
316
|
}
|
|
325
317
|
}
|
|
326
318
|
else {
|