Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added fcm config file. Updated rules for demo

Michael Rademakerbf5c4d683511
diff --git a/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json b/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json
new file mode 100644
index 000000000..62720f617
--- /dev/null
+++ b/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json
@@ -0,0 +1,12 @@
+{
+ "type": "service_account",
+ "project_id": "openremoteapp-a6a60",
+ "private_key_id": "41938f4c85f68eab00cba008a2ff419209099f9e",
+ "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDWR4K2iS/J05y6\n8lZElNZYzOhsjuJ5evjg/htiPJeiuE4KcLE8dksI716H6cdfT118BOLdMldbRDAN\nqJ9/L2bKJX8BN0VqoZU2v3fQjt1iCn+2qhycswdM5KT2YafZkV3ICQHAQpPVWslU\nB/0lRWRpZx3jWl6Ap1sULZmRLrHUrwmjGIJZ2xyn157e4i+YT/Y7MNwdPquYCKFD\nnRdUdcboDUyNOeAWwLykK4VBd8gek5aVP0x29KoWZUbN0EUF12UItuWXGpCIj+f5\noXLAoEp+pGLvEc7a+Do2krvOxA9nJr1Ao6hfgPeMYNKgTPoTjk482UJSwFeRXZ+f\n8/JESesdAgMBAAECggEAEhMGG4+G0GdhGQPH8xD645KlKEMFJ2oQBCpq9OZXhAo3\nyvmmeYsg2SgXuS8m+gsfv45J9I6Cf9hIlV5b1caRzQtMozWeTVhD1dJgsN7cHaD1\nFNtUfoM7YmkG4SFrnxZ76puX4je7cIuv376sw7AOwDVKeBrvTbrQG+ucwHpH1cCm\nbPVWQSD0WVzF2QOIDcKenhzUghxsWPB4oTBaZZvhMkYrtrAuhgo6XIIQZZMGpGqr\nliYybOFB7NkpPKEORCx3NoEA0T109VxyajgDUq7WqYNEZP6Gt9jpjb/WIOrDKmgh\ngjZ2ig7Rod1CzOO0ZiAR/bEyxsZl4hj2dZGXSzZwoQKBgQDzXmncTnNYUhd+VDej\nOOYspWJcSVCKNi5ANqiYj66S3yaB/LHsLXbxR7erWzm4ysVo1YnZytejPlDxk5yK\nSmBkIcpmhMmruEFBAuN4Uoy1sFDVcpgTqvWqRycPRki+erW0AO9fCujsxfB3b4uP\n2gFTMiACn9+3ck4fiHK0mNfeywKBgQDhZpeHvIe+q6Y68rTfTMP7Mf0O4ZhAQQci\nXO7Fn89oumO8Quu9iI8OGwsmPAji5VegMEBZtTRsEnjSLj2ZJapX06YjFtd16RBs\nHqQonWXD1yDk6CYzqwaSly68bcQccmbaFvP5SH2ROhRDAoPbIr6ehq+YPn47su8+\nNv48tM/4twKBgQCMlYONcfwLjxBnN3sUXLAKJldVfDx8OqQpD+oAhy+PRDzYZgLZ\nrcHBy238HKyRZQD4eDIzj4tVj4/unRiWgjSAY0yqQBbHjZ6UUXjZbsY9xmZLhvD2\nm5FiFcwodK9c6UHBg7DDNGgtLoKkW9lA9exCBPicy4HOVMdwS8AHNyusVQKBgDCJ\nBtgToKdODt1ipc/vl8PfX750lXRAjGi52jBz2RWUDSXcwyZs4WEIMb5p7v/sopG7\n0h9/BWrAD4QysNDpa2S+Dmg/4uVg6khd0LtuKRuil1KzKoa1rRSjuUyZ1kDJ4ZvU\nlXR4R5GeD/7d68akFKfOGMGPs17niNy8usIXrTDBAoGAMvcRwF+jGyEJyQnS7wmX\n7WPBYcdTGAbiqm+G9TfBQOPeTppGhHcLlHu8SMS3zCROor1eoK/GjmXqP5tHCQpx\n48TK16uCP8WqfXsjMaAJLZzvCVYLGCXqeW9SphpFiG+/6A9DerJ+hOlFWY72tL7u\nSPXl36aO+kVXYk5ngpfxLOk=\n-----END PRIVATE KEY-----\n",
+ "client_email": "firebase-adminsdk-c40fr@openremoteapp-a6a60.iam.gserviceaccount.com",
+ "client_id": "116224360723880183433",
+ "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+ "token_uri": "https://oauth2.googleapis.com/token",
+ "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+ "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-c40fr%40openremoteapp-a6a60.iam.gserviceaccount.com"
+}
diff --git a/manager/src/main/resources/demo/rules/smartcity/DeKuip.json b/manager/src/main/resources/demo/rules/smartcity/DeKuip.json
index 52004c75f..483eb2566 100644
--- a/manager/src/main/resources/demo/rules/smartcity/DeKuip.json
+++ b/manager/src/main/resources/demo/rules/smartcity/DeKuip.json
@@ -45,7 +45,13 @@
{
"action": "notification",
"target": {
- "useAssetsFromWhen": true
+ "matchedAssets": {
+ "types": [
+ {
+ "predicateType": "string"
+ }
+ ]
+ }
},
"notification": {
"name": "De Kuip",
diff --git a/manager/src/main/resources/demo/rules/smartcity/Euromast.json b/manager/src/main/resources/demo/rules/smartcity/Euromast.json
index 26534d751..698f862b6 100644
--- a/manager/src/main/resources/demo/rules/smartcity/Euromast.json
+++ b/manager/src/main/resources/demo/rules/smartcity/Euromast.json
@@ -45,7 +45,13 @@
{
"action": "notification",
"target": {
- "useAssetsFromWhen": true
+ "matchedAssets": {
+ "types": [
+ {
+ "predicateType": "string"
+ }
+ ]
+ }
},
"notification": {
"name": "Euromast",
diff --git a/profile/demo-openremote.yml b/profile/demo-openremote.yml
index 993be9fe5..939f5254a 100644
--- a/profile/demo-openremote.yml
+++ b/profile/demo-openremote.yml
@@ -90,6 +90,7 @@ services:
environment:
MAP_TILES_PATH: '/deployment.local/map/mapdata.mbtiles'
IDENTITY_NETWORK_HOST: demo.openremote.io
+ FIREBASE_CONFIG_FILE: '/deployment/manager/openremoteapp-a6a60-firebase-adminsdk-c40fr-41938f4c85.json'
keycloak:
extends: