Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

 src/main/java/com/gitblit/wicket/pages/SessionPage.java

@@ -60,7 +60,7 @@
      // try to authenticate by servlet request

      HttpServletRequest httpRequest = ((WebRequest) getRequestCycle().getRequest())

            .getHttpServletRequest();

      UserModel user = app().session().authenticate(httpRequest);

      UserModel user = app().authentication().authenticate(httpRequest);



      // Login the user

      if (user != null) {

@@ -70,7 +70,7 @@


         // Set Cookie

         WebResponse response = (WebResponse) getRequestCycle().getResponse();

         app().session().setCookie(response.getHttpServletResponse(), user);

         app().authentication().setCookie(response.getHttpServletResponse(), user);



         session.continueRequest();

      }