work in progres

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/common/AbstractController.java

@@ -118,15 +118,15 @@ public final List<TaskState> getTaskStates(){
     @ModelAttribute("context")
     public final String getCurrentContext(
         @ModelAttribute("userSession") UserSessionBean userSession,
-        @ModelAttribute("userSession") Locale locale
+        Locale locale
     ){
         if(userSession == null){
             userSession = new UserSessionBean();
         }
+        Context context = getContext(userSession);
         if(locale == null){
             locale = Locale.ENGLISH;
         }
-        Context context = getContext(userSession);
         if(locale == GERMAN){
             return context.getNameDe();
         } else {
@@ -145,8 +145,12 @@ protected UserAccount getUser() {
 
     protected Context getContext(UserSessionBean userSession){
         UserAccount thisUser = this.getUser();
-        long defaultContextId = thisUser.getDefaultContext().getId();
-        Context context = contextService.findByIdAndUserAccount(defaultContextId, thisUser);
+        if(userSession == null){
+            userSession = new UserSessionBean();
+            long defaultContextId = thisUser.getDefaultContext().getId();
+            userSession.setLastContextId(defaultContextId);
+        }
+        Context context = contextService.findByIdAndUserAccount(userSession.getLastContextId(), thisUser);
         userSession.setLastContextId(context.getId());
         userSession.setUserAccountid(thisUser.getId());
         return context;

src/main/java/org/woehlke/simpleworklist/common/AuditModel.java

@@ -77,8 +77,6 @@ public int hashCode() {
     public String toString() {
         return "AuditModel{" +
                 "uuid='" + uuid + '\'' +
-                ", rowCreatedAt=" + rowCreatedAt +
-                ", rowUpdatedAt=" + rowUpdatedAt +
                 '}';
     }
 

src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java

@@ -35,7 +35,7 @@
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true, exclude = "userPassword")
+@ToString(callSuper = true, exclude = {"userPassword","defaultContext","lastLoginTimestamp"})
 public class UserAccount extends AuditModel implements Serializable, ComparableById<UserAccount> {
 
     private static final long serialVersionUID = 7860692526488291439L;

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java

@@ -16,7 +16,7 @@
 
 @Slf4j
 @Controller
-@RequestMapping(path = "/user")
+@RequestMapping(path = "/user/register")
 public class UserRegistrationController {
 
     private final UserAccountService userAccountService;
@@ -35,7 +35,7 @@ public UserRegistrationController(UserAccountService userAccountService, UserReg
      * @param model
      * @return Formular for entering Email-Address for Registration
      */
-    @RequestMapping(path = "/register", method = RequestMethod.GET)
+    @RequestMapping(path = "", method = RequestMethod.GET)
     public final String registerGet(Model model) {
         log.info("registerGet");
         UserRegistrationForm userRegistrationForm = new UserRegistrationForm();
@@ -51,7 +51,7 @@ public final String registerGet(Model model) {
      * @param model
      * @return info page at success or return to form with error messages.
      */
-    @RequestMapping(path = "/register", method = RequestMethod.POST)
+    @RequestMapping(path = "", method = RequestMethod.POST)
     public final String registerPost(
             @Valid UserRegistrationForm userRegistrationForm,
             BindingResult result,
@@ -92,7 +92,7 @@ public final String registerPost(
      * @param model
      * @return Formular for Entering Account Task or Error Messages.
      */
-    @RequestMapping(path = "/register/confirm/{confirmId}", method = RequestMethod.GET)
+    @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.GET)
     public final String registerConfirmGet(
         @PathVariable String confirmId,
         Model model
@@ -120,7 +120,7 @@ public final String registerConfirmGet(
      * @param model
      * @return login page at success or page with error messages.
      */
-    @RequestMapping(path = "/register/confirm/{confirmId}", method = RequestMethod.POST)
+    @RequestMapping(path = "/confirm/{confirmId}", method = RequestMethod.POST)
     public final String registerConfirmPost(
         @PathVariable String confirmId,
         @Valid UserAccountForm userAccountForm,

src/main/resources/application.yml

@@ -5,10 +5,6 @@ server:
   compression:
     enabled: false
     min-response-size: 2048
-
-
-    server:
-
 spring:
   datasource:
     url: jdbc:postgresql://localhost:5432//simpleworklist
@@ -80,8 +76,10 @@ org:
           - "/user/login*"
           - "/user/register*"
           - "/user/register/**"
+          - "/user/register/confirm/**"
           - "/user/resetPassword*"
           - "/user/resetPassword/**"
+          - "/user/resetPassword/confirm/**"
           - "/error*"
         strengthBCryptPasswordEncoder: 10
 ---