@hmcts/ccd-case-ui-toolkit 7.0.0-rc7 → 7.0.0-rc8

package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs

@@ -1247,6 +1247,13 @@ class HttpError {
                 error[key] = response.error.hasOwnProperty(key) && response.error[key] ? response.error[key] : error[key];
             });
         }
+        // Error object in HttpErrorResponse will be empty for 403 errors
+        // Set the error properties of HttpError accordingly
+        if (response?.status === 403) {
+            error.error = response.statusText;
+            error.status = response.status;
+            error.message = response.message;
+        }
         return error;
     }
 }
@@ -1292,9 +1299,7 @@ class HttpErrorService {
         }
         let httpError = new HttpError();
         if (error instanceof HttpErrorResponse) {
-            if (error.headers
-                && error.headers.get(HttpErrorService.CONTENT_TYPE)
-                && error.headers.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON) !== -1) {
+            if (error.headers?.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON) !== -1) {
                 try {
                     httpError = HttpError.from(error);
                 }
@@ -1328,7 +1333,7 @@ class HttpErrorService {
         console.error('Handling error in http error service.');
         console.error(error);
         const httpError = HttpErrorService.convertToHttpError(error);
-        if (redirectIfNotAuthorised && (httpError.status === 401 || httpError.status === 403)) {
+        if (redirectIfNotAuthorised && httpError.status === 401) {
             this.authService.signIn();
         }
         return throwError(httpError);
@@ -25798,12 +25803,13 @@ CaseTimelineModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [Commo
 i0.ɵɵsetComponentScope(CaseTimelineComponent, function () { return [i1.NgIf, i1.NgSwitch, i1.NgSwitchCase, CaseHistoryComponent, EventLogComponent]; }, function () { return [i1$1.RpxTranslatePipe]; });
 
 class CaseResolver {
-    constructor(caseNotifier, draftService, navigationNotifierService, router, sessionStorage) {
+    constructor(caseNotifier, draftService, navigationNotifierService, router, sessionStorage, appConfig) {
         this.caseNotifier = caseNotifier;
         this.draftService = draftService;
         this.navigationNotifierService = navigationNotifierService;
         this.router = router;
         this.sessionStorage = sessionStorage;
+        this.appConfig = appConfig;
         router.events.pipe(filter(event => event instanceof NavigationEnd))
             .subscribe((event) => {
             this.previousUrl = event.url;
@@ -25848,7 +25854,7 @@ class CaseResolver {
             else {
                 console.info('getAndCacheCaseView - Path B.');
                 return this.caseNotifier.fetchAndRefresh(cid)
-                    .pipe(catchError(error => this.processErrorInCaseFetch(error)))
+                    .pipe(catchError(error => this.processErrorInCaseFetch(error, cid)))
                     .toPromise();
             }
         }
@@ -25860,9 +25866,9 @@ class CaseResolver {
             this.caseNotifier.cachedCaseView = plainToClassFromExist(new CaseView(), caseView);
             this.caseNotifier.announceCase(this.caseNotifier.cachedCaseView);
             return this.caseNotifier.cachedCaseView;
-        }), catchError(error => this.processErrorInCaseFetch(error))).toPromise();
+        }), catchError(error => this.processErrorInCaseFetch(error, cid))).toPromise();
     }
-    processErrorInCaseFetch(error) {
+    processErrorInCaseFetch(error, caseReference) {
         console.error('!!! processErrorInCaseFetch !!!');
         console.error(error);
         // TODO Should be logged to remote logging infrastructure
@@ -25870,12 +25876,16 @@ class CaseResolver {
             this.router.navigate(['/search/noresults']);
             return of(null);
         }
-        console.error(error);
         if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
             this.router.navigate(['/list/case']);
             return of(null);
         }
-        if (error.status !== 401 && error.status !== 403) {
+        // Error 403 and enable-restricted-case-access Launch Darkly flag is enabled, navigate to restricted case access page
+        if (error.status === 403 && this.appConfig.getEnableRestrictedCaseAccessConfig()) {
+            this.router.navigate([`/cases/restricted-case-access/${caseReference}`]);
+            return of(null);
+        }
+        if (error.status !== 401) {
             this.router.navigate(['/error']);
         }
         this.goToDefaultPage();
@@ -25901,11 +25911,11 @@ CaseResolver.PARAM_CASE_ID = 'cid';
 CaseResolver.CASE_CREATED_MSG = 'The case has been created successfully';
 CaseResolver.defaultWAPage = '/work/my-work/list';
 CaseResolver.defaultPage = '/cases';
-CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0.ɵɵinject(CaseNotifier), i0.ɵɵinject(DraftService), i0.ɵɵinject(NavigationNotifierService), i0.ɵɵinject(i1$2.Router), i0.ɵɵinject(SessionStorageService)); };
+CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0.ɵɵinject(CaseNotifier), i0.ɵɵinject(DraftService), i0.ɵɵinject(NavigationNotifierService), i0.ɵɵinject(i1$2.Router), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(AbstractAppConfig)); };
 CaseResolver.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CaseResolver, factory: CaseResolver.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseResolver, [{
         type: Injectable
-    }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1$2.Router }, { type: SessionStorageService }]; }, null); })();
+    }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1$2.Router }, { type: SessionStorageService }, { type: AbstractAppConfig }]; }, null); })();
 
 class EventTriggerResolver {
     constructor(casesService, alertService, profileService, profileNotifier) {