Skip to content

Commit 1f943cf

Browse files
thomaswoehlkethomaswoehlke
committed
## 2.3.28
* fixed #302 update Spring-Boot to Version to 2.3.7 * Issue #304 update webjars for bootstrap et al. * fixed #305 Update spring-data-releasetrain to latest GA * fixed #306 Update spring-session-bom to latest GA * fixed #308 Password Recovery is broken
1 parent 8bb64b4 commit 1f943cf

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎src/main/java/org/woehlke/simpleworklist/user/account/UserSelfserviceController.java‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ public String userProfileAndMenu(
5151
@ModelAttribute("locale") Locale locale,
5252
Model model
5353
){
54-
log.info("userProfileAndMenu");
54+
log.debug("userProfileAndMenu");
5555
Context context = super.getContext(userSession);
5656
UserAccount user = context.getUserAccount();
5757
Page<UserAccount> users = userAccountService.findAll(request);
5858
for(UserAccount u:users){
59-
log.info(u.getUserFullname()+": "+u.getUserEmail());
59+
log.debug(u.getUserFullname()+": "+u.getUserEmail());
6060
}
6161
Map<Long,Integer> usersToNewMessages = userAccountService.getNewIncomingMessagesForEachOtherUser(user);
6262
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserProfileAndMenu(locale);
@@ -74,7 +74,7 @@ public String userNameForm(
7474
@ModelAttribute("locale") Locale locale,
7575
Model model
7676
){
77-
log.info("userNameForm");
77+
log.debug("userNameForm");
7878
Context context = super.getContext(userSession);
7979
UserAccount user = context.getUserAccount();
8080
UserChangeNameForm bean = new UserChangeNameForm(user.getUserFullname());
@@ -94,7 +94,7 @@ public String userNameStore(
9494
@ModelAttribute("locale") Locale locale,
9595
Model model
9696
){
97-
log.info("userNameStore");
97+
log.debug("userNameStore");
9898
Context context = super.getContext(userSession);
9999
UserAccount user = context.getUserAccount();
100100
if(result.hasErrors()) {
@@ -118,7 +118,7 @@ public String userPasswordForm(
118118
@ModelAttribute("locale") Locale locale,
119119
Model model
120120
){
121-
log.info("userPasswordForm");
121+
log.debug("userPasswordForm");
122122
Context context = super.getContext(userSession);
123123
UserAccount user = context.getUserAccount();
124124
UserChangePasswordForm userChangePasswordForm = new UserChangePasswordForm();
@@ -138,52 +138,52 @@ public String userPasswordStore(
138138
@ModelAttribute("locale") Locale locale,
139139
Model model
140140
) {
141-
log.info("userPasswordStore");
141+
log.debug("userPasswordStore");
142142
Context context = super.getContext(userSession);
143143
UserAccount user = context.getUserAccount();
144-
log.info("---------------------------------------------------------");
145-
log.info("userPasswordStore");
144+
log.debug("---------------------------------------------------------");
145+
log.debug("userPasswordStore");
146146
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserChangePassword(locale);
147147
model.addAttribute("breadcrumb", breadcrumb);
148148
model.addAttribute("thisUser", user);
149149
model.addAttribute("userChangePasswordForm", userChangePasswordForm);
150150
if(result.hasErrors()) {
151-
log.info("result has Errors");
151+
log.debug("result has Errors");
152152
for(ObjectError error : result.getAllErrors()){
153-
log.info(error.toString());
153+
log.debug(error.toString());
154154
}
155155
model.addAttribute("userSession", userSession);
156156
return "user/selfservice/password";
157157
} else {
158158
if(! userChangePasswordForm.passwordsAreTheSame()){
159-
log.info("passwords Are Not The Same");
159+
log.debug("passwords Are Not The Same");
160160
String objectName = "userChangePasswordForm";
161161
String field = "userPassword";
162162
String defaultMessage = "Passwords aren't the same.";
163163
FieldError e = new FieldError(objectName, field, defaultMessage);
164164
result.addError(e);
165165
for(ObjectError error : result.getAllErrors()){
166-
log.info(error.toString());
166+
log.debug(error.toString());
167167
}
168168
model.addAttribute("userSession", userSession);
169169
return "user/selfservice/password";
170170
}
171171
if(!userAccountAccessService.confirmUserByLoginAndPassword(
172172
user.getUserEmail(), userChangePasswordForm.getOldUserPassword())
173173
){
174-
log.info("old Password is wrong");
174+
log.debug("old Password is wrong");
175175
String objectName = "userChangePasswordForm";
176176
String field = "oldUserPassword";
177177
String defaultMessage = "Password is incorrect";
178178
FieldError e = new FieldError(objectName, field, defaultMessage);
179179
result.addError(e);
180180
for(ObjectError error : result.getAllErrors()){
181-
log.info(error.toString());
181+
log.debug(error.toString());
182182
}
183183
model.addAttribute("userSession", userSession);
184184
return "user/selfservice/password";
185185
}
186-
log.info("OK");
186+
log.debug("OK");
187187
userAccountAccessService.changeUsersPassword(userChangePasswordForm,user);
188188
model.addAttribute("userSession", userSession);
189189
return "redirect:/user/selfservice/profile";
@@ -196,7 +196,7 @@ public String userContextsForm(
196196
@ModelAttribute("locale") Locale locale,
197197
Model model
198198
){
199-
log.info("userContextsForm");
199+
log.debug("userContextsForm");
200200
Context context = super.getContext(userSession);
201201
UserAccount user = context.getUserAccount();
202202
UserChangeDefaultContextForm bean = new UserChangeDefaultContextForm();
@@ -219,17 +219,17 @@ public String userContextsSave(
219219
@ModelAttribute("locale") Locale locale,
220220
Model model
221221
){
222-
log.info("userContextsSave");
222+
log.debug("userContextsSave");
223223
Context context = super.getContext(userSession);
224224
UserAccount user = context.getUserAccount();
225225
List<Context> contexts = contextService.getAllForUser(user);
226226
model.addAttribute("contexts", contexts);
227227
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContexts(locale);
228228
model.addAttribute("breadcrumb", breadcrumb);
229229
if(result.hasErrors()){
230-
log.info("userContextsSave: result has Errors");
230+
log.debug("userContextsSave: result has Errors");
231231
for(ObjectError error : result.getAllErrors()){
232-
log.info(error.toString());
232+
log.debug(error.toString());
233233
}
234234
model.addAttribute("userSession", userSession);
235235
return "user/selfservice/context/all";
@@ -251,7 +251,7 @@ public String userNewContextGet(
251251
@ModelAttribute("locale") Locale locale,
252252
Model model
253253
){
254-
log.info("userNewContextGet");
254+
log.debug("userNewContextGet");
255255
Context context = super.getContext(userSession);
256256
UserAccount user = context.getUserAccount();
257257
model.addAttribute("thisUser", user);
@@ -271,16 +271,16 @@ public String userNewContextPost(
271271
@ModelAttribute("locale") Locale locale,
272272
Model model
273273
){
274-
log.info("userNewContextPost");
274+
log.debug("userNewContextPost");
275275
Context context = super.getContext(userSession);
276276
UserAccount user = context.getUserAccount();
277277
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContextAdd(locale);
278278
model.addAttribute("breadcrumb", breadcrumb);
279279
model.addAttribute("thisUser", user);
280280
if(result.hasErrors()){
281-
log.info("userNewAreaStore: result has Errors");
281+
log.debug("userNewAreaStore: result has Errors");
282282
for(ObjectError error : result.getAllErrors()){
283-
log.info(error.toString());
283+
log.debug(error.toString());
284284
}
285285
model.addAttribute("userSession", userSession);
286286
return "user/selfservice/context/add";
@@ -298,7 +298,7 @@ public String userContextEditGet(
298298
@ModelAttribute("locale") Locale locale,
299299
Model model
300300
){
301-
log.info("userContextEditGet");
301+
log.debug("userContextEditGet");
302302
Context contextFromSession = super.getContext(userSession);
303303
UserAccount user = contextFromSession.getUserAccount();
304304
model.addAttribute("thisUser", user);
@@ -321,13 +321,13 @@ public String userContextEditPost(
321321
@ModelAttribute("locale") Locale locale,
322322
Model model
323323
){
324-
log.info("userContextEditPost");
324+
log.debug("userContextEditPost");
325325
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContextEdit(locale, context);
326326
model.addAttribute("breadcrumb", breadcrumb);
327327
if(result.hasErrors()){
328-
log.info("userContextEditPost: result has Errors");
328+
log.debug("userContextEditPost: result has Errors");
329329
for(ObjectError error : result.getAllErrors()){
330-
log.info(error.toString());
330+
log.debug(error.toString());
331331
}
332332
model.addAttribute("userSession", userSession);
333333
return "user/selfservice/context/edit";
@@ -349,24 +349,24 @@ public String userDeleteContextGet(
349349
@ModelAttribute("locale") Locale locale,
350350
Model model
351351
){
352-
log.info("userDeleteContextGet");
352+
log.debug("userDeleteContextGet");
353353
UserAccount thisUser = context.getUserAccount();
354354
model.addAttribute("userSession",userSession);
355355
model.addAttribute("thisUser", thisUser);
356356
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContextDelete(locale,context);
357357
model.addAttribute("breadcrumb", breadcrumb);
358358
if(userSession.getLastContextId() == context.getId()){
359-
log.info("context is active in session: "+ context);
359+
log.debug("context is active in session: "+ context);
360360
} else {
361361
if(thisUser.getDefaultContext().getId() == context.getId()){
362-
log.info("context is default context of this user: "+ context);
362+
log.debug("context is default context of this user: "+ context);
363363
} else {
364364
if(contextService.contextHasItems(context)){
365-
log.info("context has items: "+ context);
365+
log.debug("context has items: "+ context);
366366
} else {
367367
boolean deleted = contextService.delete(context);
368368
if(!deleted){
369-
log.info("context not deleted: "+ context);
369+
log.debug("context not deleted: "+ context);
370370
}
371371
}
372372
}
@@ -381,7 +381,7 @@ public String userLanguageGet(
381381
@ModelAttribute("locale") Locale locale,
382382
Model model
383383
){
384-
log.info("userLanguageGet");
384+
log.debug("userLanguageGet");
385385
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
386386
model.addAttribute("thisUser", user);
387387
model.addAttribute("languages", Language.list());
@@ -400,14 +400,14 @@ public String userLanguagePost(
400400
@ModelAttribute("locale") Locale locale,
401401
Model model
402402
){
403-
log.info("userLanguagePost");
403+
log.debug("userLanguagePost");
404404
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
405405
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserChangeLanguage(locale);
406406
model.addAttribute("breadcrumb", breadcrumb);
407407
if(result.hasErrors()){
408-
log.info("userLanguagePost: result has Errors");
408+
log.debug("userLanguagePost: result has Errors");
409409
for(ObjectError error : result.getAllErrors()){
410-
log.info(error.toString());
410+
log.debug(error.toString());
411411
}
412412
model.addAttribute("userSession", userSession);
413413
return "user/selfservice/language";

0 commit comments

Comments
 (0)