tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor(theme-shared): improve error.handler readability

pull/3652/head
mehmet-erim 6 years ago
parent
341afb26ef
commit
762546cbcb
1 changed files with 118 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 232
      npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

232
npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
View File

@ -19,7 +19,7 @@ import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http
import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common'; import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common';
import { Confirmation } from '../models/confirmation'; import { Confirmation } from '../models/confirmation';
import { ConfirmationService } from '../services/confirmation.service'; import { ConfirmationService } from '../services/confirmation.service';
import { filter } from 'rxjs/operators'; import { filter, tap } from 'rxjs/operators';
export const DEFAULT_ERROR_MESSAGES = { export const DEFAULT_ERROR_MESSAGES = {
defaultError: { defaultError: {
@ -58,111 +58,122 @@ export class ErrorHandler {
private injector: Injector, private injector: Injector,
@Inject('HTTP_ERROR_CONFIG') private httpErrorConfig: HttpErrorConfig, @Inject('HTTP_ERROR_CONFIG') private httpErrorConfig: HttpErrorConfig,
) { ) {
this.httpErrorConfig.skipHandledErrorCodes = this.httpErrorConfig.skipHandledErrorCodes || [];
this.listenToRestError();
this.listenToRouterError();
this.listenToRouterDataResolved();
}
private listenToRouterError() {
this.actions
.pipe(ofActionSuccessful(RouterError), filter(this.filterRouteErrors), tap(console.warn))
.subscribe(() => this.show404Page());
}
private listenToRouterDataResolved() {
this.actions this.actions
.pipe( .pipe(
ofActionSuccessful(RestOccurError, RouterError, RouterDataResolved), ofActionSuccessful(RouterDataResolved),
filter(this.filterErrors), filter(() => !!this.componentRef),
) )
.subscribe(res => { .subscribe(() => {
if (res instanceof RestOccurError) { this.componentRef.destroy();
const { payload: err = {} as HttpErrorResponse | any } = res; this.componentRef = null;
const body = snq( });
() => (err as HttpErrorResponse).error.error, }
DEFAULT_ERROR_MESSAGES.defaultError.title,
);
if (err instanceof HttpErrorResponse && err.headers.get('_AbpErrorFormat')) { private listenToRestError() {
const confirmation$ = this.showError(null, null, body); this.actions
.pipe(ofActionSuccessful(RestOccurError), filter(this.filterRestErrors))
.subscribe(({ payload: { err = {} as HttpErrorResponse } }) => {
const body = snq(
() => (err as HttpErrorResponse).error.error,
DEFAULT_ERROR_MESSAGES.defaultError.title,
);
if (err.status === 401) { if (err instanceof HttpErrorResponse && err.headers.get('_AbpErrorFormat')) {
confirmation$.subscribe(() => { const confirmation$ = this.showError(null, null, body);
this.navigateToLogin();
if (err.status === 401) {
confirmation$.subscribe(() => {
this.navigateToLogin();
});
}
} else {
switch ((err as HttpErrorResponse).status) {
case 401:
this.canCreateCustomError(401)
? this.show401Page()
: this.showError(
{
key: 'AbpAccount::DefaultErrorMessage401',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError401.title,
},
{
key: 'AbpAccount::DefaultErrorMessage401Detail',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError401.details,
},
).subscribe(() => this.navigateToLogin());
break;
case 403:
this.createErrorComponent({
title: {
key: 'AbpAccount::DefaultErrorMessage403',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError403.title,
},
details: {
key: 'AbpAccount::DefaultErrorMessage403Detail',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError403.details,
},
status: 403,
}); });
} break;
} else { case 404:
switch ((err as HttpErrorResponse).status) { this.canCreateCustomError(404)
case 401: ? this.show404Page()
this.canCreateCustomError(401) : this.showError(
? this.show401Page() {
: this.showError( key: 'AbpAccount::DefaultErrorMessage404',
{ defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.details,
key: 'AbpAccount::DefaultErrorMessage401', },
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError401.title, {
}, key: 'AbpAccount::DefaultErrorMessage404Detail',
{ defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
key: 'AbpAccount::DefaultErrorMessage401Detail', },
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError401.details, );
}, break;
).subscribe(() => this.navigateToLogin()); case 500:
break; this.createErrorComponent({
case 403: title: {
this.createErrorComponent({ key: 'AbpAccount::500Message',
title: { defaultValue: DEFAULT_ERROR_MESSAGES.defaultError500.title,
key: 'AbpAccount::DefaultErrorMessage403', },
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError403.title, details: {
}, key: 'AbpAccount::InternalServerErrorMessage',
details: { defaultValue: DEFAULT_ERROR_MESSAGES.defaultError500.details,
key: 'AbpAccount::DefaultErrorMessage403Detail', },
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError403.details, status: 500,
}, });
status: 403, break;
}); case 0:
break; if ((err as HttpErrorResponse).statusText === 'Unknown Error') {
case 404:
this.canCreateCustomError(404)
? this.show404Page()
: this.showError(
{
key: 'AbpAccount::DefaultErrorMessage404',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.details,
},
{
key: 'AbpAccount::DefaultErrorMessage404Detail',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
},
);
break;
case 500:
this.createErrorComponent({ this.createErrorComponent({
title: { title: {
key: 'AbpAccount::500Message', key: 'AbpAccount::DefaultErrorMessage',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError500.title, defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.title,
},
details: {
key: 'AbpAccount::InternalServerErrorMessage',
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError500.details,
}, },
status: 500, details: err.message,
isHomeShow: false,
}); });
break; }
case 0: break;
if ((err as HttpErrorResponse).statusText === 'Unknown Error') { default:
this.createErrorComponent({ this.showError(
title: { DEFAULT_ERROR_MESSAGES.defaultError.details,
key: 'AbpAccount::DefaultErrorMessage', DEFAULT_ERROR_MESSAGES.defaultError.title,
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.title, );
}, break;
details: err.message,
isHomeShow: false,
});
}
break;
default:
this.showError(
DEFAULT_ERROR_MESSAGES.defaultError.details,
DEFAULT_ERROR_MESSAGES.defaultError.title,
);
break;
}
} }
} else if (
res instanceof RouterError &&
snq(() => res.event.error.indexOf('Cannot match') > -1, false)
) {
this.show404Page();
} else if (res instanceof RouterDataResolved && this.componentRef) {
this.componentRef.destroy();
this.componentRef = null;
} }
}); });
} }
@ -259,26 +270,19 @@ export class ErrorHandler {
); );
} }
private filterErrors = ( private filterRestErrors = (instance: RestOccurError): boolean => {
instance: RestOccurError | RouterError<any, any> | RouterDataResolved, const {
): boolean => { payload: { err: { status } = {} as HttpErrorResponse },
if (instance instanceof RouterDataResolved) return true; } = instance;
if (!status) return false;
if (instance instanceof RestOccurError) { return this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === status) < 0;
const { payload: err = {} as HttpErrorResponse | any } = instance; };
if (!err.status) return true;
this.httpErrorConfig.skipHandledErrorCodes = this.httpErrorConfig.skipHandledErrorCodes || [];
return this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === err.status) < 0;
}
if (instance instanceof RouterError) { private filterRouteErrors = (instance: RouterError<any>): boolean => {
return ( return (
!snq(() => instance.event.error.indexOf('Cannot match') > -1) || snq(() => instance.event.error.indexOf('Cannot match') > -1) &&
this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === 404) < 0 this.httpErrorConfig.skipHandledErrorCodes.findIndex(code => code === 404) < 0
); );
}
}; };
} }

Write Preview
Loading…
Cancel
Save