fix: move dotenv init to utils

Author: easingthemes

.env.example

@@ -11,4 +11,4 @@ [email protected]
 # Only needed if Teams email approach is used
 EMAIL_FROM=[email protected]
 # App env (optional)
-DATA_PATH=./data# path to the data folder where tokens are stored, default is ./data
+DATA_PATH=.data# path to the data folder where tokens are stored, default is .data

README.md

@@ -86,7 +86,7 @@ router.post('/cm-webhook', async (req, res, next) => {
  * @property {string} [clientId] - The client ID (default: from environment variable CLIENT_ID).
  * @property {string} [title] - The title of the notification (default: 'Cloud Manager Pipeline Notification').
  * @property {string} [fromEmail] - The sender's email address (default: from environment variable EMAIL_FROM).
- * @property {string} [dataPath] - The path to the directory containing data JSON files (default: from environment variable DATA_PATH or './data').
+ * @property {string} [dataPath] - The path to the directory containing data JSON files (default: from environment variable DATA_PATH or '.data').
  * @property {string} [secret] - The secret used for verification, can be client_secret string, path to PublicKey or content of Public Key (default: from environment variable SECRET).
  */
 class CMNotify {
@@ -175,7 +175,7 @@ [email protected]
 # Only needed if Teams email approach is used
 [email protected]
 # App env (optional)
-DATA_PATH=./data# path to the data folder wher tokens are stored, default is ./data
+DATA_PATH=.data# path to the data folder wher tokens are stored, default is .data
 ```
 
 ## Cloud Manager Webhook

core/auth.js

@@ -1,7 +1,6 @@
 const { URL } = require('node:url');
 const { AuthorizationCode } = require('simple-oauth2');
 const { CMUtils } = require('../utils');
-const { DEFAULT_CONFIG } = require('./config');
 
 /**
  * @typedef {Object} CredentialsConfig
@@ -24,12 +23,12 @@ const { DEFAULT_CONFIG } = require('./config');
 class OAuth2Client {
   /**
    * @constructor
-   * @param [fromEmail] {string} - The email address of the sender.
-   * @param [dataPath] {string} - The path to the directory containing credentials JSON file.
+   * @param fromEmail {string} - The email address of the sender.
+   * @param dataPath {string} - The path to the directory containing credentials JSON file.
    * @throws {Error} - If fromEmail is not provided.
    * @returns {OAuth2ClientType} - The OAuth2Client instance.
    */
-  constructor(fromEmail = DEFAULT_CONFIG.fromEmail, dataPath = DEFAULT_CONFIG.dataPath) {
+  constructor(fromEmail, dataPath) {
     this.fromEmail = fromEmail;
     this.dataPath = dataPath;
     if (!this.fromEmail) {

core/config.js

@@ -1,14 +1,16 @@
-require('dotenv').config();
+const { CMUtils } = require('../utils');
+
+CMUtils.initDotEnv();
 
 const DEFAULT_CONFIG = {
   slackWebhook: process.env.SLACK_WEBHOOK,
   teamsWebhook: process.env.TEAMS_WEBHOOK,
   teamsEmail: process.env.TEAMS_EMAIL,
   orgName: process.env.ORGANIZATION_NAME,
   clientId: process.env.CLIENT_ID,
-  title: 'Cloud Manager Pipeline Notification',
+  title: process.env.TITLE || 'Cloud Manager Pipeline Notification',
   fromEmail: process.env.EMAIL_FROM,
-  dataPath: process.env.DATA_PATH || './data',
+  dataPath: process.env.DATA_PATH || '.data',
   secret: process.env.SECRET,
 }
 

core/index.js

@@ -13,7 +13,7 @@ const { CMVerify } = require('./verify');
  * @property {string} [clientId] - The client ID (default: from environment variable CLIENT_ID).
  * @property {string} [title] - The title of the notification (default: 'Cloud Manager Pipeline Notification').
  * @property {string} [fromEmail] - The sender's email address (default: from environment variable EMAIL_FROM).
- * @property {string} [dataPath] - The path to the directory containing data JSON files (default: from environment variable DATA_PATH or './data').
+ * @property {string} [dataPath] - The path to the directory containing data JSON files (default: from environment variable DATA_PATH or '.data').
  * @property {string} [secret] - The secret used for HMAC verification (default: from environment variable SECRET).
  */
 

package-lock.json

@@ -94,6 +94,16 @@ class CMUtils {
     const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
     return base64Regex.test(str);
   }
+
+  static initDotEnv() {
+    const dotenv = require('dotenv');
+    const envFilePath = this.getValidPath('.env');
+    if (envFilePath) {
+      dotenv.config({ path: envFilePath });
+    } else {
+      console.log('No .env file found. Skipping dotenv initialization.');
+    }
+  }
 }
 
 module.exports = { CMUtils };