changed files

Author: Nitin Raturi

__pycache__/main.cpython-35.pyc

@@ -36,6 +36,10 @@ def subscription():
 def push_to_all_users():
     token = request.form.get('sub_token')
     message = request.form.get('message')
+
+    token = '{"endpoint":"https://fcm.googleapis.com/fcm/send/cn2zZ1wyZmU:APA91bEBokYMmP36-gLljRWai79Uc6WOxqjum1ztj-Wm6JTkIf6DbtO05R2uXe7O1RfKYZqp0uRZR3K36-7UP-X3FeVR2Wy4NIGYHjiVLSWML8ETGdHA8UNhv5hMJWI7WJcEv1tpce0v","expirationTime":null,"keys":{"p256dh":"BDRC9vUDGoGzt8gefuR5qTPsT3_st_bU8sPj970T5xmY7RjtAVf6Yof1AwS3D6p3U3JmAqpukF7V_VC5uQw5Nec","auth":"MJNVm_d4GJblbEb9PuirJA"}}'
+    message = "hello"
+
     print("token",token)
     print("message",message)
     try:

__pycache__/push.cpython-35.pyc

@@ -10,6 +10,6 @@ def send_web_push(subscription_information, message_body):
     return webpush(
         subscription_info=subscription_information,
         data=message_body,
-        vapid_private_key=VAPID_PRIVATE_KEY,
-        vapid_claims=VAPID_CLAIMS
+        # vapid_private_key=VAPID_PRIVATE_KEY,
+        # vapid_claims=VAPID_CLAIMS
     )

__pycache__/settings.cpython-35.pyc

@@ -1,11 +1,6 @@
 'use strict';
 
-const applicationServerPublicKey = "BN4BnHEmqGkZN_Oi71tFEjTJILdAspeFWMIMvjP1ZHa-fWL-iRP3_OD0UZ9RJ4uxDDIOJhyoZu_P G9U6JJzo1AM";
-var sub_token = '';
-const pushButton = document.querySelector('.js-push-btn');
 
-let isSubscribed = false;
-let swRegistration = null;
 
 function urlB64ToUint8Array(base64String) {
 	const padding = '='.repeat((4 - base64String.length % 4) % 4);
@@ -43,13 +38,11 @@ function updateSubscriptionOnServer(subscription) {
 	// TODO: Send subscription to application server
 
 	const subscriptionJson = document.querySelector('.js-subscription-json');
-	var sub_token = document.querySelector('#sub_token');
 	const subscriptionDetails =
 		document.querySelector('.js-subscription-details');
 
 	if (subscription) {
 		subscriptionJson.textContent = JSON.stringify(subscription);
-		sub_token.value = JSON.stringify(subscription);
 		subscriptionDetails.classList.remove('is-invisible');
 		console.log("subscribe",JSON.stringify(subscription));
 	} else {
@@ -58,7 +51,7 @@ function updateSubscriptionOnServer(subscription) {
 }
 
 function subscribeUser() {
-	const applicationServerKey = urlB64ToUint8Array(applicationServerPublicKey);
+	const applicationServerKey = urlB64ToUint8Array(document.applicationServerPublicKey);
 	swRegistration.pushManager.subscribe({
 			userVisibleOnly: true,
 			applicationServerKey: applicationServerKey
@@ -67,7 +60,6 @@ function subscribeUser() {
 			console.log('User is subscribed.');
 
 			updateSubscriptionOnServer(subscription);
-			sub_token = subscription;
 			isSubscribed = true;
 
 			updateBtn();
@@ -125,29 +117,27 @@ function initializeUI() {
 		});
 }
 
-if ('serviceWorker' in navigator && 'PushManager' in window) {
-	console.log('Service Worker and Push is supported');
+document.init_push = function(){
+	const pushButton = document.querySelector('.js-push-btn');
 
-	navigator.serviceWorker.register("/static/sw.js")
-		.then(function(swReg) {
-			console.log('Service Worker is registered', swReg);
+	let isSubscribed = false;
+	let swRegistration = null;
 
-			swRegistration = swReg;
-			initializeUI();
-		})
-		.catch(function(error) {
-			console.error('Service Worker Error', error);
-		});
-} else {
-	console.warn('Push messaging is not supported');
-	pushButton.textContent = 'Push Not Supported';
-}
+	if ('serviceWorker' in navigator && 'PushManager' in window) {
+		console.log('Service Worker and Push is supported');
 
-function push_message() {
-	console.log("sub_token", sub_token);
-	$.ajax({
-		type: "POST",
-		url: "/push/",
-		data: JSON.stringify({'token':sub_token}),
-	});
+		navigator.serviceWorker.register("/static/sw.js")
+			.then(function(swReg) {
+				console.log('Service Worker is registered', swReg);
+
+				swRegistration = swReg;
+				initializeUI();
+			})
+			.catch(function(error) {
+				console.error('Service Worker Error', error);
+			});
+	} else {
+		console.warn('Push messaging is not supported');
+		pushButton.textContent = 'Push Not Supported';
+	}
 }

main.py

@@ -2,8 +2,6 @@
 
 /* eslint-disable max-len */
 
-const applicationServerPublicKey = "BN4BnHEmqGkZN_Oi71tFEjTJILdAspeFWMIMvjP1ZHa-fWL-iRP3_OD0UZ9RJ4uxDDIOJhyoZu_P G9U6JJzo1AM";
-
 /* eslint-enable max-len */
 
 function urlB64ToUint8Array(base64String) {
@@ -47,7 +45,7 @@ self.addEventListener('notificationclick', function(event) {
 
 self.addEventListener('pushsubscriptionchange', function(event) {
   console.log('[Service Worker]: \'pushsubscriptionchange\' event fired.');
-  const applicationServerKey = urlB64ToUint8Array(applicationServerPublicKey);
+  const applicationServerKey = urlB64ToUint8Array(document.applicationServerPublicKey);
   event.waitUntil(
     self.registration.pushManager.subscribe({
       userVisibleOnly: true,