From bb3b6bf55f0996ff202f4a828a817bfaf443a8ee Mon Sep 17 00:00:00 2001
From: Ali Akbar <aliraal12@gmail.com>
Date: Tue, 29 Nov 2016 12:23:48 +0700
Subject: [PATCH] Udah terima token firebase
---
IdentService/build/web/META-INF/MANIFEST.MF | 1 -
.../classes/org/IdentService/login.class | Bin 6625 -> 6725 bytes
.../src/java/org/IdentService/login.java | 4 +++-
KAA-JSP/build/web/catalog.jsp | 16 +++++++++++-----
KAA-JSP/build/web/login.jsp | 2 +-
KAA-JSP/web/catalog.jsp | 16 +++++++++++-----
KAA-JSP/web/login.jsp | 2 +-
7 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/IdentService/build/web/META-INF/MANIFEST.MF b/IdentService/build/web/META-INF/MANIFEST.MF
index 59499bc..9d885be 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
GIT binary patch
delta 2906
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
delta 2801
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
N+Q+j8dCdko@*xBZ2>bv5
diff --git a/IdentService/src/java/org/IdentService/login.java b/IdentService/src/java/org/IdentService/login.java
index 028b71b..f8def43 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 5223f33..d9fb45c 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 2cf99d5..6d5b2a3 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 5223f33..d9fb45c 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 2cf99d5..6d5b2a3 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."
--
GitLab