diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml
index d3c9c70..2926fe3 100644
--- a/bookstore-api/.idea/workspace.xml
+++ b/bookstore-api/.idea/workspace.xml
@@ -80,7 +80,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Payment.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Payment.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="228">
@@ -90,6 +90,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="LoginResource.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="348">
+              <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="BillingAddress.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -156,7 +166,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/BookstoreApplication.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/HttpSessionConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/RequestFilter.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/SecurityConfig.java" />
@@ -182,6 +191,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShippingAddress.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java" />
       </list>
     </option>
   </component>
@@ -1007,12 +1017,12 @@
       <workItem from="1488378219247" duration="650000" />
       <workItem from="1488461561430" duration="18419000" />
       <workItem from="1488731165185" duration="30270000" />
-      <workItem from="1489159532831" duration="12604000" />
+      <workItem from="1489159532831" duration="13556000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="104886000" />
+    <option name="totallyTimeSpent" value="105838000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="72" y="23" width="1280" height="797" extended-state="0" />
@@ -1059,7 +1069,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="18" />
+      <option name="time" value="19" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1227,14 +1237,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="647">
-          <caret line="71" column="33" lean-forward="false" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -1545,5 +1547,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="348">
+          <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java b/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java
index 23fb735..7769d7b 100644
--- a/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java
+++ b/bookstore-api/src/main/java/com/bookstore/resource/LoginResource.java
@@ -41,29 +41,33 @@ public class LoginResource {
         return new ResponseEntity("Logout success.",HttpStatus.OK);
     }
 
-    @RequestMapping(value="login", method = RequestMethod.POST)
-    public String loginPost(@RequestBody Map<String, String> json) throws
-            ServletException {
-        if(json.get("username") == null || json.get("password") ==null) {
-            throw new ServletException("Please fill in username and password");
-        }
-
-        String username = json.get("username");
-        String password = json.get("password");
-
-        User user= userService.findByUsername(username);
-        if (user==null) {
-            throw new ServletException("User name not found.");
-        }
-
-        String pwd = user.getPassword();
-
-        if(!password.equals(pwd)) {
-            throw new ServletException("Invalid login. Please check your name and password");
-        }
-
-        return "login success";
-    }
+//    @RequestMapping(value="login", method = RequestMethod.POST)
+//    public String loginPost(
+//            @RequestBody Map<String, String> json,
+//            HttpServletRequest request
+//    ) throws
+//            ServletException {
+//        if(json.get("username") == null || json.get("password") ==null) {
+//            throw new ServletException("Please fill in username and password");
+//        }
+//
+//        String username = json.get("username");
+//        String password = json.get("password");
+//
+//        User user= userService.findByUsername(username);
+//        if (user==null) {
+//            throw new ServletException("User name not found.");
+//        }
+//
+//        String pwd = user.getPassword();
+//
+//        if(!password.equals(pwd)) {
+//            throw new ServletException("Invalid login. Please check your name and password");
+//        }
+//
+//
+//        return "login success";
+//    }
 
     @RequestMapping(value = "/user/logout", method = RequestMethod.POST)
     public String logout() {
@@ -90,7 +94,15 @@ public class LoginResource {
 
     @RequestMapping("/token")
     @ResponseBody
-    public Map<String,String> token(HttpSession session) {
+    public Map<String,String> token(HttpSession session, HttpServletRequest request) {
+        System.out.println(request.getRemoteHost());
+
+        String remoteHost = request.getRemoteHost();
+        int portNumber = request.getRemotePort();
+
+        System.out.println(remoteHost+":"+portNumber);
+        System.out.println(request.getRemoteAddr());
+
         return Collections.singletonMap("token", session.getId());
     }
 }
diff --git a/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class b/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class
index 86ab1db..8b93f98 100644
Binary files a/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class and b/bookstore-api/target/classes/com/bookstore/resource/LoginResource.class differ