Update

ralscha · Dec 6, 2018 · 9e4a530 · 9e4a530
1 parent f47c047
commit 9e4a530
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/sw-cache/ionic.config.json b/sw-cache/ionic.config.json
@@ -1,5 +1,5 @@
 {
-  "name": "soandsoblank",
+  "name": "swcache",
   "integrations": {},
   "type": "angular"
 }
diff --git a/sw-cache/package.json b/sw-cache/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "soandsoblank",
+  "name": "swcache",
   "version": "0.0.1",
   "scripts": {
     "ng": "ng",

diff --git a/sw-push/.gitignore b/sw-push/.gitignore
@@ -22,4 +22,5 @@ nbbuild/
 dist/
 nbdist/
 .nb-gradle/
-/pushdemo-91541-firebase-adminsdk-sltyt-65f32cb28a.json
+pushdemo-da91e-firebase-adminsdk-pccrs-76f3a73740.json
+
diff --git a/sw-push/src/main/java/ch/rasc/swpush/RegistryController.java b/sw-push/src/main/java/ch/rasc/swpush/RegistryController.java
@@ -23,7 +23,7 @@ public RegistryController(FcmClient fcmClient) {
   @PostMapping("/register")
   @ResponseStatus(HttpStatus.NO_CONTENT)
   public Mono<Void> register(@RequestBody Mono<String> token) {
-    return token.doOnNext(System.out::println).then();
+    return token.doOnNext(t -> this.fcmClient.subscribe("chuck", t)).then();
   }
 
 }
diff --git a/sw-push/src/main/resources/application.properties b/sw-push/src/main/resources/application.properties
@@ -1 +1 @@
-fcm.service-account-file=D:/ws/blog/sw-push/pushdemo-91541-firebase-adminsdk-sltyt-65f32cb28a.json
+fcm.service-account-file=D:/ws/blog/sw-push/pushdemo-da91e-firebase-adminsdk-pccrs-76f3a73740.json
diff --git a/sw-push/src/main/resources/static/index.html b/sw-push/src/main/resources/static/index.html
@@ -21,8 +21,8 @@
 <body>
 <div id="outTable">
 </div>
-<script src="https://www.gstatic.com/firebasejs/5.5.7/firebase-app.js"></script>
-<script src="https://www.gstatic.com/firebasejs/5.5.7/firebase-messaging.js"></script>
+<script src="https://www.gstatic.com/firebasejs/5.6.0/firebase-app.js"></script>
+<script src="https://www.gstatic.com/firebasejs/5.6.0/firebase-messaging.js"></script>
 <script src="index.js"></script>
 </body>
 </html>
diff --git a/sw-push/src/main/resources/static/index.js b/sw-push/src/main/resources/static/index.js
@@ -3,10 +3,10 @@ async function init() {
   const registration = await navigator.serviceWorker.register('/sw.js');
   await navigator.serviceWorker.ready;	
   firebase.initializeApp({
-    'messagingSenderId': '532700130849'
+	    messagingSenderId: "544834184896"
   });
   const messaging = firebase.messaging();
-
+  messaging.usePublicVapidKey('BHioL1lTK99SeRs-Vi6lWYfw9xlTQtkVvCPsOoyrCjWyFHpCL05aDXaAFiEdam36xJdALL5ENYN6a6c-4zaMIfw');
   messaging.useServiceWorker(registration);	
 
   try {
@@ -31,6 +31,7 @@ async function init() {
     const newToken = await messaging.getToken();
     fetch('/register', { method: 'post', body: currentToken });
   });
+
 }
 
 async function showData() {

diff --git a/sw-push/src/main/resources/static/manifest.json b/sw-push/src/main/resources/static/manifest.json
@@ -1,6 +1,4 @@
 {
-  "gcm_sender_id": "103953800507",
-
   "name": "Chuck Norris Jokes",
   "short_name": "jokes",
   "start_url": "index.html",

diff --git a/sw-push/src/main/resources/static/sw.js b/sw-push/src/main/resources/static/sw.js
@@ -1,8 +1,8 @@
-importScripts('https://www.gstatic.com/firebasejs/5.5.0/firebase-app.js');
-importScripts('https://www.gstatic.com/firebasejs/5.5.0/firebase-messaging.js');
+importScripts('https://www.gstatic.com/firebasejs/5.6.0/firebase-app.js');
+importScripts('https://www.gstatic.com/firebasejs/5.6.0/firebase-messaging.js');
 
 firebase.initializeApp({
-	'messagingSenderId': '532700130849'
+    messagingSenderId: "544834184896"
 });
 
 const messaging = firebase.messaging();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fcm.service-account-file=D:/ws/blog/sw-push/pushdemo-91541-firebase-adminsdk-sltyt-65f32cb28a.json
		fcm.service-account-file=D:/ws/blog/sw-push/pushdemo-da91e-firebase-adminsdk-pccrs-76f3a73740.json