Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== diff -u -r6cea41c13ae7d7ef330284fa195209b9c201e5d2 -rf595e0b7dbd3a56c79eb3b85a2a8efa1a70bcd7c --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision 6cea41c13ae7d7ef330284fa195209b9c201e5d2) +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision f595e0b7dbd3a56c79eb3b85a2a8efa1a70bcd7c) @@ -120,19 +120,18 @@ langIsoCode, countryIsoCode, email, prefix, isUpdateUserDetails); } - // in case of request for learner with strict authentication check cache should also contain lsid + //in case of request for learner with strict authentication check cache should also contain lsid + String lsId = null; if (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method)) { - String lsId = request.getParameter(LoginRequestDispatcher.PARAM_LESSON_ID); + + lsId = request.getParameter(LoginRequestDispatcher.PARAM_LESSON_ID); if (lsId == null) { response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Login Failed - lsId parameter missing"); return; } - Authenticator.authenticate(serverMap, timestamp, extUsername, method, lsId, hash); - - } else { - Authenticator.authenticate(serverMap, timestamp, extUsername, method, hash); } - + Authenticator.authenticateLoginRequest(serverMap, timestamp, extUsername, method, lsId, hash); + User user = userMap.getUser(); String login = user.getLogin(); UserDTO loggedInUserDTO = (UserDTO) hses.getAttribute(AttributeNames.USER); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/GetServerTimeServlet.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/GetServerTimeServlet.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/GetServerTimeServlet.java (revision f595e0b7dbd3a56c79eb3b85a2a8efa1a70bcd7c) @@ -0,0 +1,69 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.webservice; + +import java.io.PrintWriter; +import java.util.Date; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; + +/** + * @author Andrey Balan + * + * @web:servlet name="GetServerTimeServlet" + * @web:servlet-mapping url-pattern="/services/getServerTime" + */ +public class GetServerTimeServlet extends HttpServlet { + + private static Logger logger = Logger.getLogger(GetServerTimeServlet.class); + + public void doPost(HttpServletRequest request, HttpServletResponse response) { + + try { + long currentTime = (new Date()).getTime(); + + response.setContentType("text/html;charset=utf-8"); + PrintWriter out = response.getWriter(); + + out.println(currentTime); + logger.warn("AAAB " + currentTime); + + out.flush(); + out.close(); + + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { + doPost(request, response); + } + +}