better error messages

pull/8/head
FlayInAHook 4 years ago
parent 03d376dae0
commit 8804b0cda1

@ -5,6 +5,7 @@ import { Observable, throwError, BehaviorSubject } from 'rxjs';
import { catchError, filter, take, switchMap } from 'rxjs/operators'; import { catchError, filter, take, switchMap } from 'rxjs/operators';
import { SnackBarService } from '../services/snackbar.service'; import { SnackBarService } from '../services/snackbar.service';
import { Router, RouterStateSnapshot } from '@angular/router'; import { Router, RouterStateSnapshot } from '@angular/router';
import { JsonPipe } from '@angular/common';
@Injectable() @Injectable()
export class TokenInterceptor implements HttpInterceptor { export class TokenInterceptor implements HttpInterceptor {
@ -33,6 +34,7 @@ export class TokenInterceptor implements HttpInterceptor {
errorMessage = "Die aktuelle Sitzung ist abgelaufen. Bitte loggen sie sich erneut ein." errorMessage = "Die aktuelle Sitzung ist abgelaufen. Bitte loggen sie sich erneut ein."
this.router.navigate(["/login"], { queryParams: { returnUrl: this.router.routerState.snapshot.url } }); this.router.navigate(["/login"], { queryParams: { returnUrl: this.router.routerState.snapshot.url } });
} else*/ } else*/
console.log(JSON.stringify(error.message) + JSON.stringify(error.error));
if (error.status === 401) { if (error.status === 401) {
var urlSplit : string[] = error.url.split("/"); var urlSplit : string[] = error.url.split("/");
if (urlSplit[3] === "users" && urlSplit[5] === "update"){ // Allow user pw updates to be processed correctly if (urlSplit[3] === "users" && urlSplit[5] === "update"){ // Allow user pw updates to be processed correctly
@ -41,7 +43,7 @@ export class TokenInterceptor implements HttpInterceptor {
return this.handle401Error(request, next); return this.handle401Error(request, next);
} }
} else { } else {
errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}.`; errorMessage = `${error.error.message}. Error Code: ${error.status}.`;
} }
} }
this.snackBar.openSnackBar(errorMessage, "Ok", true); this.snackBar.openSnackBar(errorMessage, "Ok", true);

Loading…
Cancel
Save