From 0ab1490d1c95ed8cdb79c4cd7f442b5525d1ba34 Mon Sep 17 00:00:00 2001
From: Mo <born19th@gmail.com>
Date: Sun, 19 Jul 2015 12:47:33 +0300
Subject: [PATCH] don't save login in field

---
 utils/src/main/java/ru/trader/edce/EDSession.java     | 8 ++------
 utils/src/test/java/ru/trader/edce/EDSessionDemo.java | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/utils/src/main/java/ru/trader/edce/EDSession.java b/utils/src/main/java/ru/trader/edce/EDSession.java
index 1473f14..fa9d581 100644
--- a/utils/src/main/java/ru/trader/edce/EDSession.java
+++ b/utils/src/main/java/ru/trader/edce/EDSession.java
@@ -32,15 +32,11 @@ public class EDSession {
     private final static String USER_AGENT = "Mozilla/5.0 (iPhone; CPU iPhone OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Mobile/11D257";
     private final static String COOKIE_FILE = "edce.tmp";
 
-    private final String login;
-    private final String password;
     private CookieStore cookieStore;
     private CloseableHttpClient httpClient;
     private ED_SESSION_STATUS lastStatus;
 
-    public EDSession(String login, String password) throws IOException, ClassNotFoundException {
-        this.login = login;
-        this.password = password;
+    public EDSession() throws IOException, ClassNotFoundException {
         this.lastStatus = ED_SESSION_STATUS.LOGIN_REQUIRED;
         initClient();
     }
@@ -55,7 +51,7 @@ public class EDSession {
                 .build();
     }
 
-    public void login(){
+    public void login(String login, String password){
         LOG.info("Login to {}, email {}", COMPANION_DOMAIN, login);
         HttpUriRequest loginRequest = RequestBuilder.post(LOGIN_URL)
                 .addParameter("email", login)
diff --git a/utils/src/test/java/ru/trader/edce/EDSessionDemo.java b/utils/src/test/java/ru/trader/edce/EDSessionDemo.java
index 491c8b7..8ba5e0d 100644
--- a/utils/src/test/java/ru/trader/edce/EDSessionDemo.java
+++ b/utils/src/test/java/ru/trader/edce/EDSessionDemo.java
@@ -22,18 +22,20 @@ public class EDSessionDemo {
 
     public static void main(String args[]) throws Exception {
         LOG.info("Test ED Companion connect");
-        EDSession edSession = new EDSession("frontier@mail.ru","elite");
+        EDSession edSession = new EDSession();
         if (edSession.getLastStatus() == ED_SESSION_STATUS.OK){
             LOG.info("Check get profile");
             edSession.readProfile(s ->{});
         }
         if (edSession.getLastStatus() == ED_SESSION_STATUS.LOGIN_REQUIRED) {
-            edSession.login();
+            String login = readLine("Login:");
+            String pass = readLine("Password:");
+            edSession.login(login, pass);
             if (edSession.getLastStatus() == ED_SESSION_STATUS.VERIFICATION_REQUIRED) {
                 LOG.info("Check verification");
                 String code = readLine("Verify code:");
                 edSession.submitVerifyCode(code);
-                edSession.login();
+                edSession.login(login, pass);
             }
             if (edSession.getLastStatus() == ED_SESSION_STATUS.OK) {
                 LOG.info("Check get profile");