fix: update dependencies

Author: easingthemes

package-lock.json

@@ -19,12 +19,11 @@
     "test": "echo \"Error: no test specified\""
   },
   "dependencies": {
-    "@netcentric/cm-notify-core": "^1.0.2",
+    "@netcentric/cm-notify-core": "^1.0.6",
     "dotenv": "16.5.0",
     "ejs": "^3.1.10",
     "express": "^5.1.0",
-    "express-session": "^1.18.1",
-    "google-auth-library": "^9.15.1"
+    "express-session": "^1.18.1"
   },
   "devDependencies": {
     "@ngrok/ngrok": "^1.4.1"

package.json

@@ -30,7 +30,7 @@ router.get('/', (req, res, next) => {
 router.post('/', async (req, res, next) => {
   let isValidEvent;
   try {
-    isValidEvent = await cmNotify.post(req.body);
+    isValidEvent = await cmNotify.post(req);
   } catch (error) {
     console.error('Error posting notification:', error.message);
     res.status(400);

server/routes/webhook.js

@@ -1,4 +1,4 @@
-const { CMUtils } = require('@netcentric/cm-notify-core');
+const { CMUtils } = require('../../utils/index');
 
 const getOrg = (pipelinesJson) => {
   const pageUrl = pipelinesJson._links.page;

setup/adobe/getPipelineData.js renamed to setup/adobe/start.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 const express = require('express');
 const session = require('express-session');
 const indexRouter = require('./routes/index');

setup/google/app.js

@@ -0,0 +1,87 @@
+const { createServer } = require('node:http');
+
+/**
+ * Create an HTTP server.
+ * @param app
+ * @param serverPort
+ */
+function createHttpServer(app, serverPort) {
+  /**
+   * Get port from the environment and store in Express.
+   */
+  const port = normalizePort(serverPort);
+  app.set('port', port);
+
+  /**
+   * Create an HTTP server.
+   */
+  const server = createServer(app);
+
+  /**
+   * Listen on provided port, on all network interfaces.
+   */
+  server.listen(port);
+  server.on('error', onError);
+  server.on('listening', onListening);
+
+  /**
+   * Normalize a port into a number, string, or false.
+   */
+  function normalizePort(val) {
+    const port = parseInt(val, 10);
+
+    if (isNaN(port)) {
+      // named pipe
+      return val;
+    }
+
+    if (port >= 0) {
+      // port number
+      return port;
+    }
+
+    return false;
+  }
+
+  /**
+   * Event listener for HTTP server "error" event.
+   */
+  function onError(error) {
+    if (error.syscall !== 'listen') {
+      throw error;
+    }
+
+    var bind = typeof port === 'string'
+      ? 'Pipe ' + port
+      : 'Port ' + port;
+
+    // handle specific listen errors with friendly messages
+    switch (error.code) {
+      case 'EACCES':
+        console.error(bind + ' requires elevated privileges');
+        process.exit(1);
+        break;
+      case 'EADDRINUSE':
+        console.error(bind + ' is already in use');
+        process.exit(1);
+        break;
+      default:
+        throw error;
+    }
+  }
+
+  /**
+   * Event listener for HTTP server "listening" event.
+   */
+  function onListening() {
+    const addr = server.address();
+    const bind = typeof addr === 'string'
+      ? 'pipe ' + addr
+      : 'port ' + addr.port;
+    console.log('Listening on ' + bind);
+  }
+
+  return server;
+}
+
+module.exports = { createHttpServer };

setup/google/authClient.js

@@ -1,59 +1,54 @@
-const fs = require('node:fs');
 const express = require('express');
-const { CMUtils } = require('@netcentric/cm-notify-core');
-const { getCredentials, handleErrorSimple, stopServer } = require('../utils');
+const { OAuth2Client } = require('@netcentric/cm-notify-core/core/auth');
+const { handleErrorSimple, stopServer } = require('../utils');
 
 const router = express.Router();
 
 router.get('/', function(req, res, next) {
-  const oAuth2Client = require('../authClient');
-  console.log('GET callback');
-  const { client_id } = getCredentials();
-  if (!client_id) {
-    return handleErrorSimple('No credentials', res, next);
-  }
+  const oAuth2Client = new OAuth2Client();
   // Verify state to prevent CSRF attacks
   if (req.query.state !== req.session.state) {
     return handleErrorSimple('Invalid state parameter', res, next);
   }
+
   if (req.query.error) {
     let message = req.query.error;
     if (req.query.error === 'interaction_required') {
       message = message + '. visit: ' + req.session.authUrl;
     }
     return handleErrorSimple(message, res, next);
   }
+
   if (!req.query.code) {
     return handleErrorSimple('No code', res, next);
   }
+
   console.log('Code received: ', req.query.code.length);
-  oAuth2Client.getToken(req.query.code, (err, token) => {
-    if (err) {
+  oAuth2Client.saveTokenFromCode(req.query.code)
+    .then((token) => {
+      if (!token) {
+        return handleErrorSimple('Empty token', res, next);
+      }
+      console.log('Token received: ', token.expiry_date);
+      return token;
+    })
+    .then(() => {
+      delete req.session.state;
+      delete req.session.authUrl;
+
+      res.set('Content-Type', 'text/plain');
+      res.send('Token received. You can close this window.');
+    })
+    .catch((err) => {
       console.error('Error getting token', err);
       return handleErrorSimple('Error getting token', res, next);
-    }
-    if (!token) {
-      return handleErrorSimple('Empty token', res, next);
-    }
-    console.log('Token:', token.expiry_date);
-    delete req.session.state;
-    delete req.session.authUrl;
-    const tokenPath = CMUtils.getJsonDataFilePath('google-token.json');
-    try {
-      fs.writeFileSync(tokenPath, JSON.stringify(token), 'utf-8');
-      console.log('Token saved:', tokenPath);
-    } catch (e) {
-      console.error('Error saving token', e);
-      return handleErrorSimple('Error saving token', res, next);
-    }
-    res.set('Content-Type', 'text/plain');
-    res.send('Token received. You can close this window.');
-
-    // Shutdown after saving token
-    setTimeout(() => {
-      stopServer(req);
-    }, 1000);
-  });
+    })
+    .finally(() => {;
+      // Shutdown after saving token
+      setTimeout(() => {
+        stopServer(req);
+      }, 1000);
+    });
 });
 
 module.exports = router;

setup/google/createHttpServer.js

@@ -1,17 +1,16 @@
 const { randomBytes} = require('node:crypto');
 const express = require('express');
-const { getAuthUrl } = require('../getAuthUrl');
-const { DEFAULT_CONFIG } = require('../../../config');
+const { OAuth2Client } = require('@netcentric/cm-notify-core/core/auth');
 
 const router = express.Router();
 
 router.get('/', function(req, res, next) {
-  console.log('GET init');
+  const oauth2Client = new OAuth2Client();
   // Generate a secure random state value.
   const state = randomBytes(32).toString('hex');
   // Store state in the session
   req.session.state = state;
-  const authUrl = getAuthUrl(state, DEFAULT_CONFIG.fromEmail);
+  const authUrl = oauth2Client.getAuthUrl(state);
   req.session.authUrl = authUrl;
   res.redirect(authUrl);
 });