Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'debug-webpush' into 'master' 

Better error handler for push notifications subscription

See merge request framasoft/mobilizon!952
This commit is contained in:
Thomas Citharel 2021-06-24 09:49:34 +00:00
parent ebe2e148d0 a542f94379
commit 9ff66dc356
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/i18n/en_US.json
View File

@ -1053,5 +1053,6 @@
"An error has occured while refreshing the page.": "An error has occured while refreshing the page.", "An error has occured while refreshing the page.": "An error has occured while refreshing the page.",
"Join group {group}": "Join group {group}", "Join group {group}": "Join group {group}",
"Public preview": "Public preview", "Public preview": "Public preview",
"On {instance} and other federated instances": "On {instance} and other federated instances" "On {instance} and other federated instances": "On {instance} and other federated instances",
"Error while subscribing to push notifications": "Error while subscribing to push notifications"
} }

5
js/src/i18n/fr_FR.json
View File

@ -45,7 +45,7 @@
"Accessible through link": "Accessible uniquement par lien", "Accessible through link": "Accessible uniquement par lien",
"Account": "Compte", "Account": "Compte",
"Actions": "Actions", "Actions": "Actions",
"Activate browser notification": "Activer le notifications du navigateur", "Activate browser notification": "Activer les notifications du navigateur",
"Activated": "Activé", "Activated": "Activé",
"Active": "Actif·ive", "Active": "Actif·ive",
"Activity": "Activité", "Activity": "Activité",
@ -1144,5 +1144,6 @@
"An error has occured while refreshing the page.": "Une erreur est survenue lors du rafraîchissement de la page.", "An error has occured while refreshing the page.": "Une erreur est survenue lors du rafraîchissement de la page.",
"Join group {group}": "Rejoindre le groupe {group}", "Join group {group}": "Rejoindre le groupe {group}",
"Public preview": "Aperçu public", "Public preview": "Aperçu public",
"On {instance} and other federated instances": "Sur {instance} et d'autres instances fédérées" "On {instance} and other federated instances": "Sur {instance} et d'autres instances fédérées",
"Error while subscribing to push notifications": "Erreur lors de la souscriptions aux notifications push"
} }

17
js/src/services/push-subscription.ts
View File

@ -33,14 +33,15 @@ export async function subscribeUserToPush(): Promise<PushSubscription | null> {
data?.config?.webPush?.publicKey data?.config?.webPush?.publicKey
), ),
}; };
const pushSubscription = await registration.pushManager.subscribe( try {
subscribeOptions const pushSubscription = await registration.pushManager.subscribe(
); subscribeOptions
console.log( );
"Received PushSubscription: ", console.debug("Received PushSubscription: ", pushSubscription);
JSON.stringify(pushSubscription) return pushSubscription;
); } catch (e) {
return pushSubscription; console.error("Error while subscribing to push notifications", e);
}
} }
return null; return null;
} }

4
js/src/views/Settings/Notifications.vue
View File

@ -597,6 +597,10 @@ export default class Notifications extends Vue {
}); });
this.subscribed = true; this.subscribed = true;
console.log(data); console.log(data);
} else {
this.$notifier.error(
this.$t("Error while subscribing to push notifications") as string
);
} }
} else { } else {
console.log("can't do webpush"); console.log("can't do webpush");