Add notification action buttons in macOS

1 files changed, 19 insertions, 12 deletions

diff --git a/gui/src/main/notification-controller.ts b/gui/src/main/notification-controller.ts
index c011ce7665..c5c30b42ef 100644
--- a/gui/src/main/notification-controller.ts
+++ b/gui/src/main/notification-controller.ts
@@ -9,6 +9,7 @@ import {
   ConnectingNotificationProvider,
   DisconnectedNotificationProvider,
   ErrorNotificationProvider,
+  NotificationAction,
   ReconnectingNotificationProvider,
   SystemNotification,
   SystemNotificationProvider,
@@ -117,24 +118,30 @@ export default class NotificationController {
       timeoutType: systemNotification.critical ? 'never' : 'default',
     });
 
-    if (systemNotification.action) {
-      notification.on('click', () => {
-        consumePromise(
-          this.notificationControllerDelegate.openLink(
-            systemNotification.action!.url,
-            systemNotification.action!.withAuth,
-          ),
-        );
-      });
+    // Action buttons are only available on macOS.
+    if (process.platform === 'darwin') {
+      if (systemNotification.action) {
+        notification.actions = [{ type: 'button', text: systemNotification.action.text }];
+        notification.on('action', () => this.performAction(systemNotification.action));
+      }
+      notification.on('click', () => this.notificationControllerDelegate.openApp());
     } else {
-      notification.on('click', () => {
-        this.notificationControllerDelegate.openApp();
-      });
+      if (systemNotification.action) {
+        notification.on('click', () => this.performAction(systemNotification.action));
+      } else {
+        notification.on('click', () => this.notificationControllerDelegate.openApp());
+      }
     }
 
     return notification;
   }
 
+  private performAction(action?: NotificationAction) {
+    if (action && action.type === 'open-url') {
+      consumePromise(this.notificationControllerDelegate.openLink(action.url, action.withAuth));
+    }
+  }
+
   private showTunnelStateNotification(systemNotification: SystemNotification) {
     const message = systemNotification.message;
     const lastAnnouncement = this.lastTunnelStateAnnouncement;