admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2021-12-17 (pull request #312)

Browse Source 
release/2021-12-17

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-12-16 17:05:18 +00:00
parent 22829fb649 99c6ea30a9
commit 6bee702770
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/components/profile-shops/profile-shops.container.jsx
View File

@@ -35,11 +35,17 @@ export function ProfileShopsContainer({ bodyshop }) {
const updateActiveShop = async (activeShopId) => {
logImEXEvent("profile_change_active_shop");
await axios.post("/notifications/unsubscribe", {
fcm_tokens: await getToken(messaging),
imexshopid: bodyshop.imexshopid,
type: "messaging",
});
try {
const fcm_tokens = await getToken(messaging);
await axios.post("/notifications/unsubscribe", {
fcm_tokens,
imexshopid: bodyshop.imexshopid,
type: "messaging",
});
} catch (error) {
console.log("No FCM token. Skipping unsubscribe.");
}
await Promise.all(
data.associations.map(async (record) => {
await updateAssocation({

18
client/src/redux/user/user.sagas.js
View File

@@ -101,13 +101,19 @@ export function* signOutStart() {
logImEXEvent("redux_sign_out");
const state = yield select();
console.log(yield getToken(messaging));
//unsub from topic.
yield call(axios.post, "/notifications/unsubscribe", {
fcm_tokens: yield getToken(messaging),
imexshopid: state.user.bodyshop.imexshopid,
type: "messaging",
});
try {
const fcm_tokens = yield getToken(messaging);
yield call(axios.post, "/notifications/unsubscribe", {
fcm_tokens,
imexshopid: state.user.bodyshop.imexshopid,
type: "messaging",
});
} catch (error) {
console.log("No FCM token. Skipping unsubscribe.");
}
yield signOut(auth);
yield put(signOutSuccess());