FCLT#85545 App-notificaties op android via Google HTTP v1 API

svn path=/Database/trunk/; revision=66395
This commit is contained in:
Jos Groot Lipman
2024-10-01 13:42:54 +00:00
parent 79a70ae0ee
commit ff6b515338
5 changed files with 49 additions and 5 deletions

View File

@@ -3442,8 +3442,8 @@ FAC_LCL('lcl_prs_bedrijfadres_type_i', 'Service (IOT)', 'Service (IOT)')
FAC_LCL('lcl_prs_bedrijfadres_type_r', 'Catering', 'Catering')
FAC_LCL('lcl_prs_bedrijfadres_type_e_intern', 'ERP synchronisatie', 'ERP synchronisation')
FAC_LCL('lcl_prs_bedrijfadres_authmethod', 'Authenticatie mode', 'Authenticatie mode')
FAC_LCL('lcl_prs_bedrijfadres_authmethodLOV', '0;Automatisch;1;Geforceerd Basic;2;Eigen HTTP header;3;Aan xml toevoegen;4;oAuth basic',
'0;Automatic;1;Forced Basic;2;Custom HTTP header;3;Add to xml;4;oAuth basic')
FAC_LCL('lcl_prs_bedrijfadres_authmethodLOV', '0;Automatisch;1;Geforceerd Basic;2;Eigen HTTP header;3;Aan xml toevoegen;4;oAuth basic;5;Google Auth',
'0;Automatic;1;Forced Basic;2;Custom HTTP header;3;Add to xml;4;oAuth basic;5;Google Auth')
FAC_LCL('lcl_authenticatie', 'Authenticatie', 'Authentication')
FAC_LCL('lcl_prs_bedrijfadres_oa_token_url', 'oAuth token_url', 'oAuth token_url')

View File

@@ -19,7 +19,7 @@ CREATE GLOBAL TEMPORARY TABLE tmp_set (
fac_setting_type
VARCHAR2(32) NOT NULL,
fac_setting_default
VARCHAR2(1024),
VARCHAR2(4000),
fac_setting_description
VARCHAR2(250) UNIQUE NOT NULL,
fac_setting_comment
@@ -852,8 +852,12 @@ DEFINE_SETTING('PUO', 0000, 'WEB_FACTAB', 'puo_uid' , 'string
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'bdradrfiles_path' , 'string' , NULL , 'Technische adressen bijlagen folder')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_apppushurl' , 'string' , '' , 'URL for pushing APP1 notifications')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_app2pushurl' , 'string' , 'https://fcm.googleapis.com/fcm/send' , 'URL for pushing APP2 notifications')
DEFINE_SETTING('PUO', 0000, 'WEB_FACFAC', 'puo_app2secret' , 'string' , 'AAAACkskZvA:APA91bGv1P1_0myDdm9_wEj22f5PDjD3XrO_7X7o6Eok93wHNlXuGPMyl-bK508zc5-mdDjwIZPpamSmDDa6ykIJulcJGkJ3lZnJ-ngx-Cak-lzoL_-gWTb5GFvUDvFg5hnP1MNG1-SG', 'Push secret for APP2 notifications')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_app2pushurl' , 'string' , 'https://fcm.googleapis.com/v1/projects/facilitor-165209/messages:send' , 'URL for pushing APP2 notifications')
DEFINE_SETTING('PUO', 0000, 'WEB_FACFAC', 'puo_app2secret' , 'string' , '#included in next line', 'Google JSONKey secret for APP2 notifications')
UPDATE tmp_set
SET fac_setting_default = '
#include "facilitor-165209-firebase-adminsdk-xts0z-042cb975b9.json"
' WHERE fac_setting_name = 'puo_app2secret';
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_bcc' , 'string' , '' , 'Blind copy email address for ORDERS only')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_cc' , 'string' , '' , 'Copy email address for ORDERS only')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_connectionflag' , 'number' , '0' , 'INTERNET_FLAG_PASSIVE = 0x8000000, else = 0')

View File

@@ -0,0 +1,13 @@
{
"type": "service_account",
"project_id": "facilitor-165209",
"private_key_id": "042cb975b9b456956773da035272efce0cf00285",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQQJNL05OmzmCp\nu5yFfOdH21TkMGFYDvAUYqlvGu3waIEbnYU4Gu2FEj2rGRgcnrgOKWYxp+b58BkM\nWxBZ61wgpRIvvFUTHSmR3pLU3eRaxTlqJPFYHAQavi28a38nlM5EMXWGmLOKI25j\nUe4vbU3+WnP0kTTjLnSK0Pcm/bSp/b/zuERi1WcDtFLvVP/ZdwnAy/CzILbkC8Wm\nCckVYgFmcxK91mZ755mafn5Pn4zt8HkA4NzZivqhM4vOn7zXaJnwON2sQNxUTyJv\n+q8Pa4FRHHBPVO86uKWEUlciRDoVokZyon7a0QeVJv5otuLJF1p15+jUNN5eMGgV\nUOBkfzBnAgMBAAECggEAOVUpFfCcFSaeXaee8KExjSo75cvizKx3OCr0e5/A5RWs\nBs1HFwMA1yxmTTwWjL16mspSfzbkAv+t/O6uo4Z7YdAp18YrLAMhtAO56Rfd/EO5\n65mOQL411Wkz5Vj2O0WV652av+muJh+p7piwKbJwVsEdqB0UX5zlngyqxpj8drk2\niIEwz6diyRWv3dczZfhbbZLfVuRDLicfcyLK566OIg1a2WhniZbntksrwFLC5lkq\n8nRepvgTeIGg9b5Q+zP74iENU/onfyLSZ82KB+SVgC68D5wBjAVcoVk1MCD7SpSE\nkze4Dbo+rdOVFb/vB7g80pT8EagFZ8jpvzWQyE6HaQKBgQDEWhYHkXVffwEle9lo\nmanlFAkR/OYw99oglWhkAUWsBonegxccdDkprpnoaeQxzFhr5vwdd/Bt4J1y5W48\nhJUF61AN7FJ1+3DfBZ7Lg9i/HmtoaQUebTFjJOU6V4FIP/LkWke4xKinmg2sr875\nL9aTkMyFEPLL4vXYp/AJxIaUjwKBgQC8EsxphJ6vSnkX5wrFRKEfrswwHb9+N9kx\n5UVeO8SRyt3PJ1lJqpqgIHcQh18HFtdbSwgLZOYZilkyfDIoVNx7UJyb59vFTKdO\n/epGyT583MQk8Yoy0bdQEPgkTWk2yKjhW7CJcTLDpd2/GNf7r5mHsk1Qwi5XaxKu\nmeHX6KICqQKBgDVFC3z6JZHG7xSwSQdryP/xM5TBu+HFHFSCtFONVM2a6ISJpBeA\nIJICYJcBQ3uPKN39SKDmDUCCE7U8MXARuCxm7s0YNDb2BGU9LRuhpYgURKeK9myO\nyztOozH004o6bzcslxC1qdvum48iE1DffaODQTlIo9ZUuMYSqbi8rJZZAoGALwpk\npl/NcPqnnxrizsSDqHEIEWDfbKp7YMd/ujooyG59XDrzUkGhuztjjHbPhe5onyT9\nNhxekTTRapc11HClVRKsmTI8/fRWRKOt3VaokoKFbNgdQOjDePtFlY7nKhS2aOeO\nGFJ/5/+snwePvhwFwrMOM4zeGm9llNZYbrB5FUECgYEAo/VqIOKag9wwMhw7CiYv\nSx2xtRf4KJT9cEtNYm3DBLZrJsUNKdIH8MujHTZ83ISybN0j9OkcA+5jEsFGGcnt\niKQ2wVPcSEm74ujx+RjOtElrTfYaUf1da/eqIH+cCrLfGA4qdglt7jGDKYSJ/nlC\n3hqreqJE75MQnvGOOr3Eoh4=\n-----END PRIVATE KEY-----\n",
"client_email": "firebase-adminsdk-xts0z@facilitor-165209.iam.gserviceaccount.com",
"client_id": "106239533568553355908",
"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-xts0z%40facilitor-165209.iam.gserviceaccount.com",
"universe_domain": "googleapis.com"
}

View File

@@ -250,4 +250,5 @@ MENU_INS_AFTER('lcl_menu_unusedstats', 'lcl_menu_about', -2);
REGISTERONCE('$Id$')
#define POST_RECREATE "DB48to49_post.src"
#include "epilogue.inc"

26
_UP/DB48to49_post.src Normal file
View File

@@ -0,0 +1,26 @@
/* DB48TO49_POST.SRC
*
* Update script van FACILITOR schema
* Uitgevoerd *na* de recreate zodat puo_app2secret de goede waarde heeft
*
* LET OP: De makefile detecteert timestamp van dit bestand niet
*
* $Revision$
* $Id$
*/
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#85545
UPDATE prs_bedrijfadres
SET prs_bedrijfadres_url = fac.getsetting('puo_app2pushurl'),
prs_bedrijfadres_privkey = fac.getsetting('puo_app2secret'),
prs_bedrijfadres_oa_scope = 'https://www.googleapis.com/auth/firebase.messaging',
prs_bedrijfadres_authmethod = 5 -- GoogleAuth
WHERE prs_bedrijf_key IN (SELECT prs_bedrijf_key
FROM prs_bedrijf
WHERE prs_bedrijf_naam = 'Aareon Facilitor Mobile app')
AND prs_bedrijfadres_type = 'N';
REGISTERONCE('$Id$')
COMMIT;