fix: allow X-CloudScheduler header to bypass canonical redirect and trigger test email

Author: gtracy

cron.yaml

@@ -7,6 +7,11 @@ cron:
   url: /tasks/generate-stats
   schedule: every 24 hours
 
+- description: admin test email (trigger on demand)
+  url: /dailyemail/test
+  schedule: every 8760 hours
+  timezone: America/Chicago
+
 - description: daily APOD email
   url: /dailyemail/2009/1/7
   schedule: every day 10:00

server.js

@@ -16,9 +16,10 @@ app.use((req, res, next) => {
         return next();
     }
 
-    // Skip GAE internal requests (Cron, Task Queues)
+    // Skip GAE internal requests (Cron, Task Queues, Cloud Scheduler)
     if (
         req.headers['x-appengine-cron'] ||
+        req.headers['x-cloudscheduler'] ||
         req.headers['x-appengine-taskname'] ||
         req.headers['x-appengine-queuename']
     ) {

src/routes.js

@@ -207,10 +207,11 @@ router.get('/usercount', async (req, res) => {
     }
 });
 
-// Admin APOD Email Test Endpoint (Protected by GAE Cron header)
+// Admin APOD Email Test Endpoint (Protected by GAE Cron or Cloud Scheduler header)
 router.get('/dailyemail/test', async (req, res) => {
-    // Only allow invocations from App Engine Cron / Cloud Scheduler
-    if (!req.get('X-AppEngine-Cron')) {
+    // Only allow invocations from App Engine Cron or Cloud Scheduler
+    const isCron = req.get('X-AppEngine-Cron') || req.get('X-CloudScheduler');
+    if (!isCron) {
         return res.status(403).send('Forbidden');
     }
 

test/integration/redirect.test.js

@@ -99,6 +99,16 @@ describe('Canonical Redirection Middleware Tests', () => {
         expect(response.status).not.toBe(301);
     });
 
+    it('should NOT redirect Cloud Scheduler requests', async () => {
+        const response = await request(app)
+            .get('/dailyemail/test')
+            .set('Host', 'apod-email-node.uc.r.appspot.com')
+            .set('X-Forwarded-Proto', 'http')
+            .set('X-CloudScheduler', 'true');
+
+        expect(response.status).not.toBe(301);
+    });
+
     it('should NOT redirect in non-production environments', async () => {
         // Override back to test environment
         process.env.NODE_ENV = 'test';

test/integration/routes.test.js

@@ -86,7 +86,7 @@ describe('Route Integration Tests', () => {
             }
         });
 
-        it('should trigger enqueueEmails with ADMIN_EMAIL and return 200', async () => {
+        it('should trigger enqueueEmails with ADMIN_EMAIL when X-AppEngine-Cron is present and return 200', async () => {
             process.env.ADMIN_EMAIL = 'admin@example.com';
             const enqueueSpy = vi.spyOn(emailService, 'enqueueEmails').mockResolvedValue(1);
 
@@ -101,6 +101,21 @@ describe('Route Integration Tests', () => {
             });
         });
 
+        it('should trigger enqueueEmails with ADMIN_EMAIL when X-CloudScheduler is present and return 200', async () => {
+            process.env.ADMIN_EMAIL = 'admin@example.com';
+            const enqueueSpy = vi.spyOn(emailService, 'enqueueEmails').mockResolvedValue(1);
+
+            const response = await request(app)
+                .get('/dailyemail/test')
+                .set('X-CloudScheduler', 'true');
+
+            expect(response.status).toBe(200);
+            expect(response.text).toBe('Enqueued 1 test task.');
+            expect(enqueueSpy).toHaveBeenCalledWith(null, null, null, null, {
+                recipients: ['admin@example.com']
+            });
+        });
+
         it('should ignore query params and only use ADMIN_EMAIL', async () => {
             process.env.ADMIN_EMAIL = 'admin@example.com';
             const enqueueSpy = vi.spyOn(emailService, 'enqueueEmails').mockResolvedValue(1);