From 04a98505a4ab8f48aee22800fcac193d9367d0ae Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 29 Nov 2013 11:05:51 -0500 Subject: [PATCH] Refactor user services and separate authentication (issue-281) --- src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java index a3c1ece..ec5fe16 100644 --- a/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -51,7 +51,7 @@ } UserModel user = GitBlitWebSession.get().getUser(); - if (!app().users().supportsCredentialChanges(user)) { + if (!app().authentication().supportsCredentialChanges(user)) { error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"), app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true); } @@ -100,7 +100,7 @@ app().gitblit().updateUserModel(user.username, user, false); if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) { WebResponse response = (WebResponse) getRequestCycle().getResponse(); - app().session().setCookie(response.getHttpServletResponse(), user); + app().authentication().setCookie(response.getHttpServletResponse(), user); } } catch (GitBlitException e) { error(e.getMessage()); -- Gitblit v1.9.1