start bugfix

This commit is contained in:
Maren Süwer
2019-01-02 11:31:05 +01:00
parent d0e13fcb09
commit 63585eed5d
2 changed files with 16 additions and 3 deletions

View File

@@ -22,7 +22,8 @@
"error-notification": { "error-notification": {
"prefix": "Error", "prefix": "Error",
"loginLink": "You can login here again.", "loginLink": "You can login here again.",
"timeout": "The session has expired." "timeout": "The session has expired.",
"wrong-login-credentials": "Invalid credentials"
}, },
"loading": { "loading": {
"alt": "Loading ..." "alt": "Loading ..."

View File

@@ -15,7 +15,8 @@ import {
InputField, InputField,
SubmitButton, SubmitButton,
ErrorNotification, ErrorNotification,
Image Image,
UNAUTHORIZED_ERROR
} from "@scm-manager/ui-components"; } from "@scm-manager/ui-components";
import classNames from "classnames"; import classNames from "classnames";
import { getLoginLink } from "../modules/indexResource"; import { getLoginLink } from "../modules/indexResource";
@@ -92,18 +93,29 @@ class Login extends React.Component<Props, State> {
return !this.isValid(); return !this.isValid();
} }
areCredentialsInvalid() {
const { t, error } = this.props;
if (error === UNAUTHORIZED_ERROR) {
return new Error(t("login.wrong-login-credentials"));
} else {
return error;
}
}
renderRedirect = () => { renderRedirect = () => {
const { from } = this.props.location.state || { from: { pathname: "/" } }; const { from } = this.props.location.state || { from: { pathname: "/" } };
return <Redirect to={from} />; return <Redirect to={from} />;
}; };
render() { render() {
const { authenticated, loading, error, t, classes } = this.props; const { authenticated, loading, t, classes } = this.props;
if (authenticated) { if (authenticated) {
return this.renderRedirect(); return this.renderRedirect();
} }
const error = this.areCredentialsInvalid();
return ( return (
<section className="hero"> <section className="hero">
<div className="hero-body"> <div className="hero-body">