Adding better support for IOS to use FCM (#453)

Signed-off-by: Dan Cunningham <[email protected]>
openhab · May 25, 2024 · 6ba6c6a · 6ba6c6a
1 parent 05353eb
commit 6ba6c6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/routes/devices.js b/routes/devices.js
@@ -71,7 +71,7 @@ exports.devicessendmessage = function (req, res) {
                     if (!error && sendMessageDevice) {
                         if (sendMessageDevice.fcmRegistration) {
                             firebase.sendNotification(sendMessageDevice.fcmRegistration, newNotification);
-                        } else if (sendMessageDevice.deviceType == 'ios') {
+                        } else if (sendMessageDevice.iosDeviceToken) {
                             appleSender.sendAppleNotification(sendMessageDevice.iosDeviceToken, message);
                         }
                         req.flash('info', 'Your message was sent');

diff --git a/routes/index.js b/routes/index.js
@@ -225,8 +225,11 @@ Routes.prototype.setupAppRoutes = function (app) {
     app.all('/api/v1/hidenotification/:id', this.ensureRestAuthenticated, this.setOpenhab, this.preassembleBody, api_routes.hidenotification);
     app.all('/api/v1/settings/notifications', this.ensureRestAuthenticated, this.setOpenhab, this.preassembleBody, api_routes.notificationssettingsget);
 
-    // Android app registration
+    // Android app registration (FCM)
     app.all('/addAndroidRegistration*', this.ensureRestAuthenticated, this.setOpenhab, this.preassembleBody, fcmRegistrationService.registerAndroid);
+    // Apple app registration (FCM)
+    app.all('/addIosRegistration*', this.ensureRestAuthenticated, this.setOpenhab, this.preassembleBody, fcmRegistrationService.registerIos);
+    // Apple app registration (legacy)
     app.all('/addAppleRegistration*', this.ensureRestAuthenticated, this.setOpenhab, this.preassembleBody, appleRegistrationService);
 };
 

diff --git a/socket-io.js b/socket-io.js
@@ -434,7 +434,7 @@ function SocketIO(server, system) {
             for (var i = 0; i < userDevices.length; i++) {
                 if (userDevices[i].fcmRegistration) {
                     fcmRegistrations.push(userDevices[i].fcmRegistration);
-                } else if (userDevices[i].deviceType === 'ios') {
+                } else if (userDevices[i].iosDeviceToken) {
                     iosDeviceTokens.push(userDevices[i].iosDeviceToken);
                 }
             }