hale-commenting-system 3.5.0 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "A commenting system for PatternFly React applications that allows designers and developers to add comments directly on design pages, sync with GitHub Issues, and link Jira tickets.",
   "homepage": "https://www.npmjs.com/package/hale-commenting-system",
   "license": "MIT",

package/scripts/integrate.js

@@ -474,6 +474,7 @@ GITHUB_CLIENT_SECRET=
   }
 
   if (config.jira && config.jira.apiToken) {
+    const trimmedToken = String(config.jira.apiToken || '').trim();
     envServerContent += `# Jira API Token (server-only)
 # For Red Hat Jira, generate a Personal Access Token:
 # 1. Visit: https://issues.redhat.com/secure/ViewProfile.jspa
@@ -481,7 +482,7 @@ GITHUB_CLIENT_SECRET=
 # 3. Click "Create token"
 # 4. Give it a name and remove expiration
 # 5. Copy the token
-JIRA_API_TOKEN=${config.jira.apiToken}
+JIRA_API_TOKEN=${trimmedToken}
 `;
   } else {
     envServerContent += `# Jira API Token (server-only)
@@ -496,7 +497,8 @@ JIRA_API_TOKEN=
   }
 
   if (config.jira && config.jira.email) {
-    envServerContent += `JIRA_EMAIL=${config.jira.email}\n`;
+    const trimmedEmail = String(config.jira.email || '').trim();
+    envServerContent += `JIRA_EMAIL=${trimmedEmail}\n`;
   }
 
   if (fs.existsSync(envServerPath)) {
@@ -507,13 +509,16 @@ JIRA_API_TOKEN=
       const lines = existing.split('\n');
       const updatedLines = lines.map(line => {
         if (line.startsWith('GITHUB_CLIENT_SECRET=')) {
-          return `GITHUB_CLIENT_SECRET=${config.github?.clientSecret || ''}`;
+          const trimmed = String(config.github?.clientSecret || '').trim();
+          return `GITHUB_CLIENT_SECRET=${trimmed}`;
         }
         if (line.startsWith('JIRA_API_TOKEN=')) {
-          return `JIRA_API_TOKEN=${config.jira?.apiToken || ''}`;
+          const trimmed = String(config.jira?.apiToken || '').trim();
+          return `JIRA_API_TOKEN=${trimmed}`;
         }
         if (line.startsWith('JIRA_EMAIL=')) {
-          return `JIRA_EMAIL=${config.jira?.email || ''}`;
+          const trimmed = String(config.jira?.email || '').trim();
+          return `JIRA_EMAIL=${trimmed}`;
         }
         return line;
       });
@@ -573,10 +578,13 @@ function integrateWebpackMiddleware() {
       // Note: Requires Node.js 18+ for native fetch() support
       try {
         const dotenv = require('dotenv');
-        dotenv.config({ path: path.resolve(__dirname, '.env') });
-        dotenv.config({ path: path.resolve(__dirname, '.env.server'), override: true });
+        const envResult = dotenv.config({ path: path.resolve(__dirname, '.env') });
+        const envServerResult = dotenv.config({ path: path.resolve(__dirname, '.env.server'), override: true });
+        if (envServerResult.error && envServerResult.error.code !== 'ENOENT') {
+          console.warn('[Commenting System] Warning loading .env.server:', envServerResult.error.message);
+        }
       } catch (e) {
-        // no-op
+        console.warn('[Commenting System] Warning loading environment files:', e.message);
       }
 
       const express = require('express');
@@ -685,12 +693,13 @@ function integrateWebpackMiddleware() {
           if (!key) return res.status(400).json({ message: 'Missing ?key (e.g. ABC-123)' });
 
           const baseUrl = (process.env.VITE_JIRA_BASE_URL || 'https://issues.redhat.com').replace(/\\/+$/, '');
-          const email = process.env.JIRA_EMAIL;
-          const token = process.env.JIRA_API_TOKEN;
+          const email = (process.env.JIRA_EMAIL || '').trim();
+          const token = (process.env.JIRA_API_TOKEN || '').trim();
 
           if (!token) {
+            console.error('[Commenting System] JIRA_API_TOKEN is missing or empty. Check .env.server file.');
             return res.status(500).json({
-              message: 'Missing JIRA_API_TOKEN. For local dev, put it in .env.server (gitignored).',
+              message: 'Missing JIRA_API_TOKEN. For local dev, put it in .env.server (gitignored). Make sure the dev server was restarted after creating/updating .env.server.',
             });
           }