diff options
author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /src/org/traccar/api/resource | |
parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
download | trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/api/resource')
-rw-r--r-- | src/org/traccar/api/resource/SessionResource.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java index 2a0bd4364..fd331c766 100644 --- a/src/org/traccar/api/resource/SessionResource.java +++ b/src/org/traccar/api/resource/SessionResource.java @@ -17,6 +17,7 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; +import org.traccar.helper.DataConverter; import org.traccar.helper.LogAction; import org.traccar.model.User; @@ -34,7 +35,6 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.xml.bind.DatatypeConverter; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -63,11 +63,11 @@ public class SessionResource extends BaseResource { if (cookies != null) { for (Cookie cookie : cookies) { if (cookie.getName().equals(USER_COOKIE_KEY)) { - byte[] emailBytes = DatatypeConverter.parseBase64Binary( + byte[] emailBytes = DataConverter.parseBase64( URLDecoder.decode(cookie.getValue(), StandardCharsets.US_ASCII.name())); email = new String(emailBytes, StandardCharsets.UTF_8); } else if (cookie.getName().equals(PASS_COOKIE_KEY)) { - byte[] passwordBytes = DatatypeConverter.parseBase64Binary( + byte[] passwordBytes = DataConverter.parseBase64( URLDecoder.decode(cookie.getValue(), StandardCharsets.US_ASCII.name())); password = new String(passwordBytes, StandardCharsets.UTF_8); } |