Merge branch 'insomnia_2014' of gitlab.codecrew.fi:codecrew/moya into insomnia_2014

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/BootstrapBeanLocal.java

@@ -23,5 +23,6 @@ import javax.ejb.Local;
 @Local
 @Local
 public interface BootstrapBeanLocal {
 public interface BootstrapBeanLocal {
 
 
-	void saneDefaults();
+	// no empty databases
+//	void saneDefaults();
 }
 }

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -298,16 +298,16 @@ public class BootstrapBean implements BootstrapBeanLocal {
 			dbModelFacade.create(dBm);
 			dbModelFacade.create(dBm);
 		}
 		}
 	}
 	}
-
-	public void saneDefaults() {
-		User adminUser = userFacade.findByLogin("admin");
-		if (adminUser == null) {
-			adminUser = new User();
-			adminUser.setLogin("admin");
-			// adminUser.setSuperadmin(true);
-			adminUser.resetPassword("admin");
-			userFacade.create(adminUser);
-		}
-	}
+// We will never run this again with empty database
+//	public void saneDefaults() {
+//		User adminUser = userFacade.findByLogin("admin");
+//		if (adminUser == null) {
+//			adminUser = new User();
+//			adminUser.setLogin("admin");
+//			// adminUser.setSuperadmin(true);
+//			adminUser.resetPassword("admin");
+//			userFacade.create(adminUser);
+//		}
+//	}
 
 
 }
 }

code/moya-beans/ejbModule/fi/codecrew/moya/beans/JaasBean.java

@@ -84,19 +84,23 @@ public class JaasBean implements MoyaRealmBeanRemote {
 	private EventBean eventorgbean;
 	private EventBean eventorgbean;
 
 
 	public EventUser tryLogin(String username, String password) {
 	public EventUser tryLogin(String username, String password) {
+		// 	username = username.trim().toLowerCase();
 
 
-		EventUser eventUser = eventUserFacade.findByLogin(username.trim().toLowerCase());
+		EventUser eventUser = eventUserFacade.findByLogin(username);
+		logger.info("Found eventuser '{}' with username '{}'", eventUser, username);
 
 
 		User user = null;
 		User user = null;
 		// Might not have EventUser
 		// Might not have EventUser
 		if (eventUser == null) {
 		if (eventUser == null) {
-			user = userfacade.findByLogin(username.trim());
+			user = userfacade.findByLogin(username);
 		} else {
 		} else {
 			user = eventUser.getUser();
 			user = eventUser.getUser();
 		}
 		}
+		logger.info("User '{}' with '{}' ", user, username);
 
 
+		// If there is no eventuser found, try to create one.
 		if (user != null) {
 		if (user != null) {
-
+			logger.info("TryLogin user not null: {}", user);
 			if (user.isAnonymous()) {
 			if (user.isAnonymous()) {
 				logger.info("logging in as anonymous!!!");
 				logger.info("logging in as anonymous!!!");
 			} else if (!user.checkPassword(password)) {
 			} else if (!user.checkPassword(password)) {
@@ -255,7 +259,7 @@ public class JaasBean implements MoyaRealmBeanRemote {
 	public String authenticateApp(String pathInfo, String appId, String userId, String appStamp, String mac) {
 	public String authenticateApp(String pathInfo, String appId, String userId, String appStamp, String mac) {
 
 
 		logger.info("Authenticat app with pathinfo {}, appid {}, userid {}, appstamp {}, mac {}",
 		logger.info("Authenticat app with pathinfo {}, appid {}, userid {}, appstamp {}, mac {}",
-				new Object[]{pathInfo, appId, userId, appStamp, mac}
+				new Object[] { pathInfo, appId, userId, appStamp, mac }
 				);
 				);
 		if (mac == null) {
 		if (mac == null) {
 			logger.warn("Rest auth failed: Mac is null");
 			logger.warn("Rest auth failed: Mac is null");

code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserFacade.java

@@ -89,11 +89,11 @@ public class UserFacade extends IntegerPkGenericFacade<User> {
 	 * 
 	 * 
 	 * @param login
 	 * @param login
 	 */
 	 */
-	public User findByLogin(String login) {
+	public User findByLogin(final String login) {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<User> cq = cb.createQuery(User.class);
 		CriteriaQuery<User> cq = cb.createQuery(User.class);
 		Root<User> root = cq.from(User.class);
 		Root<User> root = cq.from(User.class);
-		cq.where(cb.equal(root.get(User_.login), login.toLowerCase().trim()));
+		cq.where(cb.equal(root.get(User_.login), login));
 
 
 		return getSingleNullableResult(getEm().createQuery(cq));
 		return getSingleNullableResult(getEm().createQuery(cq));
 	}
 	}

code/moya-web/WebContent/foodmanager/listOrders.xhtml

@@ -80,7 +80,7 @@
 							<h:outputLabel value="#{i18n['billLine.time']}" />
 							<h:outputLabel value="#{i18n['billLine.time']}" />
 						</f:facet>
 						</f:facet>
 						<h:outputText value="#{bill.sentDate.getTime()}">
 						<h:outputText value="#{bill.sentDate.getTime()}">
-							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
+							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 						</h:outputText>
 						</h:outputText>
 					</p:column>
 					</p:column>
 					<p:column sortBy="#{bill.totalQuantity}">
 					<p:column sortBy="#{bill.totalQuantity}">
@@ -168,13 +168,13 @@
 
 
 				<h:outputLabel value="#{i18n['foodwave.ordersBefore']}: " />
 				<h:outputLabel value="#{i18n['foodwave.ordersBefore']}: " />
 				<h:outputText value="#{foodWaveView.selectedFoodWave.time}" style="font-weight: bold">
 				<h:outputText value="#{foodWaveView.selectedFoodWave.time}" style="font-weight: bold">
-					<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
+					<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 				</h:outputText>
 				</h:outputText>
 
 
 
 
 				<h:outputLabel value="#{i18n['foodwave.foodwaveLastBillPayTime']}: " />
 				<h:outputLabel value="#{i18n['foodwave.foodwaveLastBillPayTime']}: " />
 				<h:outputText value="#{foodWaveView.selectedFoodWave.lastPaymentTime}" style="font-weight: bold">
 				<h:outputText value="#{foodWaveView.selectedFoodWave.lastPaymentTime}" style="font-weight: bold">
-					<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
+					<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 				</h:outputText>
 				</h:outputText>
 
 
 			</p:panelGrid>
 			</p:panelGrid>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteAcceptView.java

@@ -115,7 +115,7 @@ public class InviteAcceptView extends GenericCDIView {
 
 
 		if (existingUsername == null) {
 		if (existingUsername == null) {
 			try {
 			try {
-				req.login(usr, pwd);
+				req.login(usr.trim().toLowerCase(), pwd);
 			} catch (ServletException e) {
 			} catch (ServletException e) {
 				logger.warn("Login failed for invite user " + usr, e);
 				logger.warn("Login failed for invite user " + usr, e);
 			}
 			}

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

@@ -131,7 +131,7 @@ public class AuthView extends GenericCDIView {
 
 
 	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()) {
 			return;
 			return;
@@ -150,7 +150,7 @@ public class AuthView extends GenericCDIView {
 		}
 		}
 
 
 		try {
 		try {
-			request.login(login.toLowerCase(), password);
+			request.login(login.trim().toLowerCase(), password);
 		} catch (Throwable e) {
 		} catch (Throwable e) {
 			logger.info("Error while trying to login {}", e.getMessage());
 			logger.info("Error while trying to login {}", e.getMessage());
 
 
@@ -163,7 +163,9 @@ public class AuthView extends GenericCDIView {
 			} else {
 			} else {
 				navihandler.forward(onError);
 				navihandler.forward(onError);
 				try {
 				try {
-					request.login(User.ANONYMOUS_LOGINNAME, null);
+					request.logout();
+					request.getSession().invalidate();
+					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);
 				}
 				}