Merge pull request #1 from modl-gg/prod-test-1

Prod test 1

Author: TheoBong

.github/workflows/build.yml

@@ -0,0 +1,32 @@
+name: "Build (Pull Request)"
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches:
+      - main
+      - dev
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '23'
+
+    - name: Install root dependencies
+      run: npm install
+
+    - name: Install client dependencies
+      run: |
+        cd client
+        npm install
+
+    - name: Run build
+      run: npm run build

.github/workflows/deploy-staging.yml

@@ -24,7 +24,7 @@ jobs:
       run: |
         ssh ${{ secrets.SERVER_USER }}@${{ secrets.STAGING_IP }} << 'EOF'
           cd /home/modl/modl-admin
-          git pull origin main
+          git pull origin dev
           npm install
           cd client
           npm install

server/services/EmailService.ts

@@ -14,14 +14,19 @@ class EmailService {
   private transporter: nodemailer.Transporter;
 
   constructor() {
+    const smtpPort = Number(process.env.SMTP_PORT) || 25;
+    const emailAuth = {
+      user: process.env.SMTP_USERNAME,
+      pass: process.env.SMTP_PASSWORD
+    };
     this.transporter = nodemailer.createTransport({
-      host: process.env.SMTP_HOST || 'localhost',
-      port: parseInt(process.env.SMTP_PORT || '25'),
-      secure: false, // Use TLS
-      auth: undefined, // No auth for local postfix
+      host: process.env.SMTP_HOST || "localhost", // Assuming postfix is running on localhost
+      port: smtpPort,
+      secure: false, // true for 465, false for other ports
       tls: {
-        rejectUnauthorized: false
-      }
+        rejectUnauthorized: false // Allow self-signed certificates
+      },
+      auth: (emailAuth.user && emailAuth.pass) ? emailAuth : undefined
     });
   }