Merge branch 'main' of https://github.com/cropgeeks/fightagainstblight

Author: sebastian-raubach

server/src/jhi/fab/UserSessionsResource.java

@@ -208,9 +208,13 @@ public synchronized Response postUser(@HeaderParam("Authorization") String authH
 		{
 			DSLContext context = DSL.using(conn, SQLDialect.MYSQL);
 
+			String email = userInfo.getEmail();
+			if (email != null)
+				email = email.toLowerCase();
+
 			Users dbUser = context.insertInto(USERS)
 				.set(USERS.USER_NAME, userInfo.getUserName())
-				.set(USERS.EMAIL, userInfo.getEmail().toLowerCase())
+				.set(USERS.EMAIL, email)
 				.set(USERS.IS_ADMIN, userInfo.getIsAdmin())
 				.returning(USERS.fields())
 				.fetchOneInto(Users.class);
@@ -240,9 +244,13 @@ public synchronized Response patchUser(@HeaderParam("Authorization") String auth
 		{
 			DSLContext context = DSL.using(conn, SQLDialect.MYSQL);
 
+			String email = userInfo.getEmail();
+			if (email != null)
+				email = email.toLowerCase();
+
 			context.update(USERS)
 				.set(USERS.USER_NAME, userInfo.getUserName())
-				.set(USERS.EMAIL, userInfo.getEmail().toLowerCase())
+				.set(USERS.EMAIL, email)
 				.set(USERS.IS_ADMIN, userInfo.getIsAdmin())
 				.where(USERS.USER_ID.eq(userInfo.getUserId()))
 				.execute();