diff --git a/IdentService/src/conf/MANIFEST.MF b/IdentService/src/conf/MANIFEST.MF
index 59499bce4a2bd51cba227b7c00fcf745b19c95a4..9d885be534121a9f146924f4832955dfe2ee2d4b 100644
--- a/IdentService/src/conf/MANIFEST.MF
+++ b/IdentService/src/conf/MANIFEST.MF
@@ -1,2 +1 @@
Manifest-Version: 1.0
-
diff --git a/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class b/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class
index 8d8af3f34616c446e678a0054ccd5d4146491086..330d031495f4e3425cb0c01fbf0ba64df7d89f75 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class and b/KAA-JSP/build/web/WEB-INF/classes/NewServlet.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class
index 6391415a9a3126e57cac65ed19b2fd2bb5f1ae8f..63ea6d742b8cd6f38440397c3d3fa52ec82cef67 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class and b/KAA-JSP/build/web/WEB-INF/classes/org/kaa/marketplaceservice/service/MarketPlaceService_Service.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class
index 41d17d8318cb2f3e7eccc17b4666edbf7770d296..ba37c6e8645c1a52c3a0270ffa9adddd806ae5e1 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/DB.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class
index 22cee34b8dc3c2c67f95d59e572853d46af0789c..0533d036109652331155f580b3751e4acfa4b4a6 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/RestAPI_consumer.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class
index 5c1b5dbe661eee7d43f7d4ea91d1d25abf4f4c2a..a5856c7893cda609d34e7485d240e7fd97b10506 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/UploadProduct.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class
index e9947b4f2d90b0b0d65f91b5576095848d3b067e..6e50e3a5a8bca4fa92971654320dcc93e699139e 100644
Binary files a/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class and b/KAA-JSP/build/web/WEB-INF/classes/org/saleproject/KAA/tokenParser.class differ
diff --git a/KAA-JSP/build/web/WEB-INF/glassfish-web.xml b/KAA-JSP/build/web/WEB-INF/glassfish-web.xml
deleted file mode 100644
index 13e0059fffb79e9888f6bfa2f5249d72cad958d1..0000000000000000000000000000000000000000
--- a/KAA-JSP/build/web/WEB-INF/glassfish-web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<glassfish-web-app error-url="">
- <class-loader delegate="true"/>
- <jsp-config>
- <property name="keepgenerated" value="true">
- <description>Keep a copy of the generated servlet class' java code.</description>
- </property>
- </jsp-config>
-</glassfish-web-app>
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 68d43219fc494deb326057a949f31bd1a2bbec3d..5223f33dd8021a110364684fed1954dfc5422029 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -49,8 +49,20 @@
firebase.initializeApp(config);
const messaging = firebase.messaging();
-
- messaging.requestPermission().then(function(){
+ messaging.requestPermission()
+ .then(function() {
+ console.log('Notification permission granted.');
+ return messaging.getToken();
+ // TODO(developer): Retrieve an Instance ID token for use with FCM.
+ // ...
+ })
+ .the(function(console)){
+ console.log(token);
+ }
+ .catch(function(err) {
+ console.log('Unable to get permission to notify.', err);
+ });
+ /*messaging.requestPermission().then(function(){
console.log('Notification permission granted');
messaging.getToken().then(function(){
if(currentToken){
@@ -85,7 +97,7 @@
messaging.onMessage(function(payload){
console.log("Message received. ",payload);
- });
+ });*/
</script>
<!--Application -->
diff --git a/KAA-JSP/build/web/login.jsp b/KAA-JSP/build/web/login.jsp
index db9b48c610e5bd9827c2148ed785880c2f1c0e20..2cf99d5aea8542e6f1512b62db3a99a4d13ff456 100644
--- a/KAA-JSP/build/web/login.jsp
+++ b/KAA-JSP/build/web/login.jsp
@@ -97,5 +97,31 @@
%>
</div>
</div>
+ <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+ <script>
+ // Initialize Firebase
+ // Initialize Firebase
+ 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();
+ messaging.requestPermission()
+ .then(function(){
+ console.log('Have Permission');
+ return messaging.getToken();
+ })
+ .then(function(token){
+ console.log(token);
+ })
+ .catch(function(err){
+ console.log('Errorr');
+ })
+ </script>
</body>
</html>
diff --git a/KAA-JSP/dist/KAA-JSP.war b/KAA-JSP/dist/KAA-JSP.war
index 596440088a0e1e8be0bd08041b72e12eebcc41f9..6860acede591c30d671d8bcef96a2fc709f8d228 100644
Binary files a/KAA-JSP/dist/KAA-JSP.war and b/KAA-JSP/dist/KAA-JSP.war differ
diff --git a/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java b/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
index 8039a7c58f181c6951307c084be3e1ffe0301c07..3d81dba3f39a626f1b975bb9dce654d2f80335ab 100644
--- a/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
+++ b/KAA-JSP/src/java/org/saleproject/KAA/RestAPI_consumer.java
@@ -33,7 +33,6 @@ public class RestAPI_consumer {
String urlRequest = APIURL + URLParameter;
URL obj = new URL(urlRequest);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
- con.setRequestProperty(APIURL, APIURL);
BufferedReader br = new BufferedReader(new InputStreamReader((con.getInputStream())));
StringBuilder sb = new StringBuilder();
String output1;
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 68d43219fc494deb326057a949f31bd1a2bbec3d..5223f33dd8021a110364684fed1954dfc5422029 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -49,8 +49,20 @@
firebase.initializeApp(config);
const messaging = firebase.messaging();
-
- messaging.requestPermission().then(function(){
+ messaging.requestPermission()
+ .then(function() {
+ console.log('Notification permission granted.');
+ return messaging.getToken();
+ // TODO(developer): Retrieve an Instance ID token for use with FCM.
+ // ...
+ })
+ .the(function(console)){
+ console.log(token);
+ }
+ .catch(function(err) {
+ console.log('Unable to get permission to notify.', err);
+ });
+ /*messaging.requestPermission().then(function(){
console.log('Notification permission granted');
messaging.getToken().then(function(){
if(currentToken){
@@ -85,7 +97,7 @@
messaging.onMessage(function(payload){
console.log("Message received. ",payload);
- });
+ });*/
</script>
<!--Application -->
diff --git a/KAA-JSP/web/login.jsp b/KAA-JSP/web/login.jsp
index db9b48c610e5bd9827c2148ed785880c2f1c0e20..2cf99d5aea8542e6f1512b62db3a99a4d13ff456 100644
--- a/KAA-JSP/web/login.jsp
+++ b/KAA-JSP/web/login.jsp
@@ -97,5 +97,31 @@
%>
</div>
</div>
+ <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+ <script>
+ // Initialize Firebase
+ // Initialize Firebase
+ 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();
+ messaging.requestPermission()
+ .then(function(){
+ console.log('Have Permission');
+ return messaging.getToken();
+ })
+ .then(function(token){
+ console.log(token);
+ })
+ .catch(function(err){
+ console.log('Errorr');
+ })
+ </script>
</body>
</html>