Merge branch 'master' into je-db-links

firebase · Mar 25, 2024 · c7a5206 · c7a5206
2 parents 3dad218 + e42840c
commit c7a5206
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 20 deletions.
diff --git a/.github/actions/send-email/package-lock.json b/.github/actions/send-email/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/messaging/messaging.ts b/src/messaging/messaging.ts
@@ -294,7 +294,7 @@ export class Messaging {
 
     return this.getUrlPath()
       .then((urlPath) => {
-        const requests: Promise<SendResponse>[] = copy.map((message) => {
+        const requests: Promise<SendResponse>[] = copy.map(async (message) => {
           validateMessage(message);
           const request: { message: Message; validate_only?: boolean } = { message };
           if (dryRun) {

diff --git a/test/unit/messaging/messaging.spec.ts b/test/unit/messaging/messaging.spec.ts
@@ -604,6 +604,19 @@ describe('Messaging', () => {
         .should.eventually.be.rejectedWith('Exactly one of topic, token or condition is required');
     });
 
+    it('should reject a message when it does not pass local validation, but still try the other messages', () => {
+      const invalidMessage: Message = { token: 'a', notification: { imageUrl: 'abc' } };
+      const messageIds = [
+        'projects/projec_id/messages/1',
+      ];
+      messageIds.forEach(id => mockedRequests.push(mockSendRequest(id)))
+      return messaging.sendEach([invalidMessage, validMessage])
+        .then((response: BatchResponse) => {
+          expect(response.successCount).to.equal(1);
+          expect(response.failureCount).to.equal(1);
+        });
+    });
+
     const invalidDryRun = [null, NaN, 0, 1, '', 'a', [], [1, 'a'], {}, { a: 1 }, _.noop];
     invalidDryRun.forEach((dryRun) => {
       it(`should throw given invalid dryRun parameter: ${JSON.stringify(dryRun)}`, () => {