merge conflict

IdentService/build/web/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
-

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);
 

KAA-JSP/build/web/catalog.jsp

@@ -39,6 +39,14 @@
  
         <script>
           // Initialize Firebase
+
+          /*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",
@@ -46,13 +54,6 @@
           storageBucket: "tugas-besar-wbd.appspot.com",
           messagingSenderId: "1049009619420"
         };
-        /*var config = {
-            apiKey: "AIzaSyAN43gCcqFx095nCBy-4abeRGkoZB1-Rok",
-            authDomain: "kaa-saleproject.firebaseapp.com",
-            databaseURL: "https://kaa-saleproject.firebaseio.com",
-            storageBucket: "kaa-saleproject.appspot.com",
-            messagingSenderId: "815161898662"
-          };*/
           firebase.initializeApp(config);
           
           const messaging = firebase.messaging();
@@ -136,8 +137,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;

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."

KAA-JSP/web/catalog.jsp

@@ -39,6 +39,14 @@
  
         <script>
           // Initialize Firebase
+
+          /*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",
@@ -46,13 +54,6 @@
           storageBucket: "tugas-besar-wbd.appspot.com",
           messagingSenderId: "1049009619420"
         };
-        /*var config = {
-            apiKey: "AIzaSyAN43gCcqFx095nCBy-4abeRGkoZB1-Rok",
-            authDomain: "kaa-saleproject.firebaseapp.com",
-            databaseURL: "https://kaa-saleproject.firebaseio.com",
-            storageBucket: "kaa-saleproject.appspot.com",
-            messagingSenderId: "815161898662"
-          };*/
           firebase.initializeApp(config);
           
           const messaging = firebase.messaging();
@@ -136,8 +137,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;

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."