Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DSP-777 Show message on all server errors in login component #200

Merged
merged 2 commits into from
Oct 5, 2020
Merged

DSP-777 Show message on all server errors in login component #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b19ad9
fix(action): Add error message to login on server error
kilchenmann Oct 5, 2020
b611048
chore(action): Better error message on server error
kilchenmann Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/dsp-ui/src/lib/action/components/login-form/login-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class LoginFormComponent implements OnInit {
forgot_pw: 'Forgot password?',
error: {
failed: 'Password or username is wrong',
server: 'There\'s an error with the server connection. Try it again later or inform the DaSCH team.'
server: 'An error has occurred when connecting to the server. Try again later or contact the DaSCH support.'
}
};

Expand Down Expand Up @@ -159,7 +159,7 @@ export class LoginFormComponent implements OnInit {
// error handling
this.loginErrorUser = (error.status === 404);
this.loginErrorPw = (error.status === 401);
this.loginErrorServer = (error.status === 0);
this.loginErrorServer = (error.status === 0 || error.status >= 500 && error.status < 600);

this.loginSuccess.emit(false);
this.errorMessage = error;
Expand Down