Send Push neu

express-server/app.js

@@ -2,6 +2,7 @@ var createError = require('http-errors');
 var express = require('express');
 var path = require('path');
 var logger = require('morgan');
+var axios = require('axios');
 
 var indexRouter = require('./routes/index');
 var usersRouter = require('./routes/users');
@@ -18,6 +19,7 @@ app.use(express.urlencoded({ extended: false }));
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
+app.use(axios);
 app.use('/users', usersRouter);
 
 // catch 404 and forward to error handler

express-server/db-connect/db-connect.js

@@ -2,6 +2,8 @@ const { query, nonQuery } = require("../db-config/postgresql-common");
 
 const stringSimilarity = require('string-similarity');
 
+
+
 //Create User Info
 
 async function updateUser(uid, mid, name, picture, email) {

express-server/push/push.js

@@ -0,0 +1,30 @@
+var admin = require('firebase-admin');
+var serviceAccount = require('../login/firebaseAdminKey.json');
+var firebaseAdmin = admin.initializeApp({
+    credential: admin.credential.cert(serviceAccount),
+    databaseURL: 'https://test-667ca.firebaseio.com'
+  });
+  
+function sendPush(msgtoken, title, text){
+  var message = {
+    notification: {
+      title: title,
+      body: text
+    },
+    token: msgtoken
+  };
+  
+  firebaseAdmin.messaging().send(message)
+  .then(function(response) {
+    // See the MessagingDevicesResponse reference documentation for
+    // the contents of response.
+    console.log('Successfully sent message:', response);
+  })
+  .catch(function(error) {
+    console.log('Error sending message:', error);
+  });
+
+}
+module.exports = {
+    sendPush
+}

express-server/routes/index.js

@@ -1,8 +1,9 @@
 var express = require('express');
 var router = express.Router();
 var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
+var push = require("./../push/push");
 // var firebase = require('firebase');
-var admin = require('firebase-admin');
+
 //Database
 var postgres = require("./../db-connect/db-connect");
 
@@ -18,40 +19,17 @@ var postgres = require("./../db-connect/db-connect");
 // };
 // firebase.initializeApp(config);
 
-var serviceAccount = require('../login/firebaseAdminKey.json');
 
 
 
 
-var firebaseAdmin = admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-  databaseURL: 'https://test-667ca.firebaseio.com'
-});
 
-function sendPush(msgtoken, title, text){
-  var message = {
-    notification: {
-      title: title,
-      body: text
-    },
-    token: msgtoken
-  };
-  
-  firebaseAdmin.messaging().send(message)
-  .then(function(response) {
-    // See the MessagingDevicesResponse reference documentation for
-    // the contents of response.
-    console.log('Successfully sent message:', response);
-  })
-  .catch(function(error) {
-    console.log('Error sending message:', error);
-  });
 
-}
+
 
 //Push
 router.get('/push/:msgtoken/:message/:title', function (req, res, next) {
-    sendPush(req.params.msgtoken, req.params.title, req.params.message);
+    push.sendPush(req.params.msgtoken, req.params.title, req.params.message);
     var sender = "Message Token: " + req.params.msgtoken + " Message: " + req.params.message + " Title: " + req.params.title;
     res.status(200).send(sender);
 });
@@ -506,5 +484,7 @@ router.post("/dones", async function(req, res, next) {
       console.log(error)
     });
   });
+  
+  
 
 module.exports = router;