diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-08 10:52:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-08 10:52:25 +0300 |
commit | 988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84 (patch) | |
tree | 85f388c16000b33676172e512a7717c6932e3be5 /src | |
parent | 1f0e1dddadd32a1f40695bf33d877d192ecd1403 (diff) | |
parent | dc78308a2cd950c6997820147dc9ee89d610923a (diff) | |
download | traccar-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.tar.gz traccar-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.tar.bz2 traccar-server-988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84.zip |
Merge pull request #2188 from ninioe/master
Automatically login remembered user
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/api/resource/SessionResource.java | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java index 745088a4d..49670c1f9 100644 --- a/src/org/traccar/api/resource/SessionResource.java +++ b/src/org/traccar/api/resource/SessionResource.java @@ -20,6 +20,7 @@ import org.traccar.api.BaseResource; import org.traccar.model.User; import javax.annotation.security.PermitAll; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -39,6 +40,8 @@ import java.sql.SQLException; public class SessionResource extends BaseResource { public static final String USER_ID_KEY = "userId"; + public static final String USER_COOKIE_KEY = "user"; + public static final String PASS_COOKIE_KEY = "password"; @javax.ws.rs.core.Context private HttpServletRequest request; @@ -47,6 +50,28 @@ public class SessionResource extends BaseResource { @GET public User get() throws SQLException { Long userId = (Long) request.getSession().getAttribute(USER_ID_KEY); + if (userId == null) { + Cookie[] cookies = request.getCookies(); + String email = null, password = null; + if (cookies != null) { + for (int i = 0; i < cookies.length; i++) { + if (cookies[i].getName().equals(USER_COOKIE_KEY)) { + email = cookies[i].getValue(); + } + if (cookies[i].getName().equals(PASS_COOKIE_KEY)) { + password = cookies[i].getValue(); + } + } + } + if (email != null && password != null) { + User user = Context.getDataManager().login(email, password); + if (user != null) { + userId = user.getId(); + request.getSession().setAttribute(USER_ID_KEY, userId); + } + } + } + if (userId != null) { return Context.getDataManager().getUser(userId); } else { |