diff --git a/IdentService/build/web/META-INF/MANIFEST.MF b/IdentService/build/web/META-INF/MANIFEST.MF
index 59499bce4a2bd51cba227b7c00fcf745b19c95a4..9d885be534121a9f146924f4832955dfe2ee2d4b 100644
--- a/IdentService/build/web/META-INF/MANIFEST.MF
+++ b/IdentService/build/web/META-INF/MANIFEST.MF
@@ -1,2 +1 @@
 Manifest-Version: 1.0
-
diff --git a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class
index 12e5e1cfdafdd3663218a99fcdb981606e901fc6..bfcfc2c393b65178e3fa12c901b8895ff41a854a 100644
Binary files a/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class and b/IdentService/build/web/WEB-INF/classes/org/IdentService/login.class differ
diff --git a/IdentService/src/java/org/IdentService/login.java b/IdentService/src/java/org/IdentService/login.java
index 028b71b1c0e71c73e191f1fe4daebf2318ef24d0..f8def43345eb4ea75fcf23afd6c33a49b5146205 100644
--- a/IdentService/src/java/org/IdentService/login.java
+++ b/IdentService/src/java/org/IdentService/login.java
@@ -83,7 +83,7 @@ public class login extends HttpServlet {
                 ResultSet rs = stmt.executeQuery(sql);
                 if (rs.next()){
                    int user_id = rs.getInt("user_id");
-                   String generatedToken = generateToken(request);
+                   //String generatedToken = generateToken(request);
                    Calendar cal = Calendar.getInstance();
                    int hours = cal.get(Calendar.HOUR_OF_DAY);
                    int tanggal = cal.get(Calendar.DATE);
@@ -97,6 +97,8 @@ public class login extends HttpServlet {
                    Date dt = cal.getTime();
                    //token akan expire dalam 60 menit
                    Timestamp ts = new Timestamp(dt.getTime());
+                   String generatedToken = tokenGenerator.nextString();
+                   generatedToken +=  ts.getTime();
                    sql = "insert into token values (\""+ user_id+ "\",\""+generatedToken+"\",\""+ts+"\")";
                    stmt.executeUpdate(sql);
 
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 5223f33dd8021a110364684fed1954dfc5422029..d9fb45cb1515a1b392c93c308f0607b6a4891696 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -39,13 +39,20 @@
  
         <script>
           // Initialize Firebase
-          var config = {
+          /*var config = {
             apiKey: "AIzaSyAN43gCcqFx095nCBy-4abeRGkoZB1-Rok",
             authDomain: "kaa-saleproject.firebaseapp.com",
             databaseURL: "https://kaa-saleproject.firebaseio.com",
             storageBucket: "kaa-saleproject.appspot.com",
             messagingSenderId: "815161898662"
-          };
+          };*/
+        var config = {
+          apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+          authDomain: "tugas-besar-wbd.firebaseapp.com",
+          databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+          storageBucket: "tugas-besar-wbd.appspot.com",
+          messagingSenderId: "1049009619420"
+        };
           firebase.initializeApp(config);
           
           const messaging = firebase.messaging();
@@ -56,7 +63,7 @@
               // TODO(developer): Retrieve an Instance ID token for use with FCM.
               // ...
             })
-            .the(function(console)){
+            .then(function(console)){
                 console.log(token); 
             }
             .catch(function(err) {
@@ -129,8 +136,7 @@
             String ParameterURL;
             
             /* Showing username of user */
-            Cookie cookie = request.getCookies()[0];
-            String user_token = cookie.getValue();
+            String user_token = request.getParameter("token");
             if (request.getParameter("like") != null){
                String productId = request.getParameter("product_id");
                boolean like;
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index 2cf99d5aea8542e6f1512b62db3a99a4d13ff456..6d5b2a3a1322584ae2c70f569983f5f77a7cbc8c 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -31,7 +31,7 @@
                     Cookie cookie = new Cookie("token",generatedToken);
                     response.addCookie(cookie);
                     response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
-                            + "jsp");
+                            + "jsp?token="+generatedToken);
                 }
                 else{
                     response.sendRedirect("http://localhost:8080/KAA-JSP/login."
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 5223f33dd8021a110364684fed1954dfc5422029..d9fb45cb1515a1b392c93c308f0607b6a4891696 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -39,13 +39,20 @@
  
         <script>
           // Initialize Firebase
-          var config = {
+          /*var config = {
             apiKey: "AIzaSyAN43gCcqFx095nCBy-4abeRGkoZB1-Rok",
             authDomain: "kaa-saleproject.firebaseapp.com",
             databaseURL: "https://kaa-saleproject.firebaseio.com",
             storageBucket: "kaa-saleproject.appspot.com",
             messagingSenderId: "815161898662"
-          };
+          };*/
+        var config = {
+          apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+          authDomain: "tugas-besar-wbd.firebaseapp.com",
+          databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+          storageBucket: "tugas-besar-wbd.appspot.com",
+          messagingSenderId: "1049009619420"
+        };
           firebase.initializeApp(config);
           
           const messaging = firebase.messaging();
@@ -56,7 +63,7 @@
               // TODO(developer): Retrieve an Instance ID token for use with FCM.
               // ...
             })
-            .the(function(console)){
+            .then(function(console)){
                 console.log(token); 
             }
             .catch(function(err) {
@@ -129,8 +136,7 @@
             String ParameterURL;
             
             /* Showing username of user */
-            Cookie cookie = request.getCookies()[0];
-            String user_token = cookie.getValue();
+            String user_token = request.getParameter("token");
             if (request.getParameter("like") != null){
                String productId = request.getParameter("product_id");
                boolean like;
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index 2cf99d5aea8542e6f1512b62db3a99a4d13ff456..6d5b2a3a1322584ae2c70f569983f5f77a7cbc8c 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -31,7 +31,7 @@
                     Cookie cookie = new Cookie("token",generatedToken);
                     response.addCookie(cookie);
                     response.sendRedirect("http://localhost:8080/KAA-JSP/catalog."
-                            + "jsp");
+                            + "jsp?token="+generatedToken);
                 }
                 else{
                     response.sendRedirect("http://localhost:8080/KAA-JSP/login."