ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4096 from MaximilianKrambach/httpError

Browse Source 
fix login not responding to errors
This commit is contained in:
Finn Stutzenstein 2019-01-10 15:07:13 +01:00 committed by GitHub
commit c76e7165af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/app/site/login/components/login-mask/login-mask.component.ts
View File

@ -7,7 +7,6 @@ import { OperatorService } from 'app/core/services/operator.service';
import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
import { FormGroup, Validators, FormBuilder } from '@angular/forms'; import { FormGroup, Validators, FormBuilder } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { HttpErrorResponse } from '@angular/common/http';
import { environment } from 'environments/environment'; import { environment } from 'environments/environment';
import { OpenSlidesService } from '../../../../core/services/openslides.service'; import { OpenSlidesService } from '../../../../core/services/openslides.service';
import { LoginDataService } from '../../../../core/services/login-data.service'; import { LoginDataService } from '../../../../core/services/login-data.service';
@ -141,13 +140,11 @@ export class LoginMaskComponent extends BaseComponent implements OnInit, OnDestr
} }
this.router.navigate([redirect]); this.router.navigate([redirect]);
} catch (e) { } catch (e) {
if (e instanceof HttpErrorResponse) { this.loginForm.setErrors({
this.loginForm.setErrors({ notFound: true
notFound: true });
}); this.loginErrorMsg = e;
this.loginErrorMsg = e.error.detail; this.inProcess = false;
this.inProcess = false;
}
} }
} }