Merge branch 'master' into 'master'

Issue #90: Näytä virheilmoitus kirjautumisen epäonnistuessa

Lisää virheilmoitus jos kirjautuminen ei onnistu.
fixes #90 

See merge request !325

code/moya-web/WebContent/resources/templates/primelayout/template.xhtml

@@ -153,6 +153,7 @@
 				<p:fieldset id="leftuserinfo" rendered="#{!sessionHandler.loggedIn}">
 				<p:fieldset id="leftuserinfo" rendered="#{!sessionHandler.loggedIn}">
 					<div style="text-align: left; padding: 0.7em;">
 					<div style="text-align: left; padding: 0.7em;">
 						<h:form>
 						<h:form>
+							<h:outputText rendered="#{authView.loginError}" styleClass="error" value="#{i18n['loginerror.message']}" /><br />
 							<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
 							<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
 							<p:watermark for="linelogin" value="#{i18n['login.username']}" />
 							<p:watermark for="linelogin" value="#{i18n['login.username']}" />
 							<br />
 							<br />

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/AuthView.java

@@ -129,11 +129,17 @@ public class AuthView extends GenericCDIView {
 		doLogin(onError);
 		doLogin(onError);
 	}
 	}
 
 
+	private boolean loginError = false;
+	public boolean isLoginError() {
+		return loginError;
+	}
 	private void doLogin(String onError) {
 	private void doLogin(String onError) {
 
 
 		//		bootStrapBean.saneDefaults();
 		//		bootStrapBean.saneDefaults();
 
 
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
+			logger.info("Username or password was empty");
+			this.loginError = true;
 			return;
 			return;
 		}
 		}
 
 
@@ -157,6 +163,7 @@ public class AuthView extends GenericCDIView {
 		try {
 		try {
 			request.login(login.trim().toLowerCase(), password);
 			request.login(login.trim().toLowerCase(), password);
 		} catch (Exception e) {
 		} catch (Exception e) {
+			this.loginError = true;
 			logger.info("Error while trying to login {}", e.getMessage());
 			logger.info("Error while trying to login {}", e.getMessage());
 
 
 		} finally {
 		} finally {
@@ -168,11 +175,11 @@ public class AuthView extends GenericCDIView {
 				navihandler.redirectToSaved();
 				navihandler.redirectToSaved();
 			} else {
 			} else {
 
 
-				navihandler.forward(onError);
+				//navihandler.forward(onError);
 				try {
 				try {
 					request.logout();
 					request.logout();
 					request.getSession().invalidate();
 					request.getSession().invalidate();
-					navihandler.forward("/frontpage?faces-redirect=true");
+					//navihandler.forward("/frontpage?faces-redirect=true");
 				} catch (ServletException e) {
 				} catch (ServletException e) {
 					logger.warn("Error while trying to relogin as anonymous", e);
 					logger.warn("Error while trying to relogin as anonymous", e);
 				}
 				}