Skip to content

fix: logout doesn't work after reload of the MyAccount page #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2022
Merged

fix: logout doesn't work after reload of the MyAccount page #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/theme/modules/customer/pages/MyAccount/MyAccount.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
:label="$t(item.label)"
:link="localeRoute(item.link)"
class="sf-content-pages__menu"
v-on="item.listeners"
v-on="{ click: getHandler(item.id) }"
/>
</li>
</SfList>
Expand Down Expand Up @@ -83,17 +83,28 @@ export default defineComponent({
}
});

const { sidebarLinkGroups } = useSidebarLinkGroups();
const { sidebarLinkGroups, logoutUser } = useSidebarLinkGroups();

const isOnSubpage = computed(() => route.value.matched.length > 1);
const goToTopLevelRoute = () => router.push(localeRoute({ name: 'customer' }));
const title = computed(() => i18n.t(route.value.matched.at(-1)?.meta.titleLabel as string));

/**
* #tab-id: handler-name
*/
const handlers = {
'log-out': logoutUser,
};

const getHandler = (id: string) => handlers[id] ?? {};

return {
sidebarLinkGroups,
title,
isOnSubpage,
goToTopLevelRoute,
logoutUser,
getHandler,
};
},
});
Expand Down
27 changes: 17 additions & 10 deletions packages/theme/modules/customer/pages/MyAccount/useSidebarLinkGroups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
import type { RawLocation } from 'vue-router';

import { useRouter, useContext } from '@nuxtjs/composition-api';
import { useUser } from '~/modules/customer/composables/useUser';
import { useCart } from '~/modules/checkout/composables/useCart';

type LinkGroup = { title: string, items: LinkGroupItem[] };
type LinkGroupItem = { label: string, link?: RawLocation, listeners?: Record<string, () => (Promise<void> | void)> };
type LinkGroupItem = { id: string, label: string, link?: RawLocation };

export const useSidebarLinkGroups = () => {
const { localeRoute } = useContext();
const { logout } = useUser();
const { clear } = useCart();

const router = useRouter();

const sidebarLinkGroups : LinkGroup[] = [
{
title: 'Personal details',
items: [
{
id: 'my-profile',
label: 'My profile',
link: { name: 'customer-my-profile' },
},
{
id: 'address-details',
label: 'Addresses details',
link: { name: 'customer-addresses-details' },
},
{
id: 'my-newsletter',
label: 'My newsletter',
link: { name: 'customer-my-newsletter' },
},
{
id: 'my-wishlist',
label: 'My wishlist',
link: { name: 'customer-my-wishlist' },
},
Expand All @@ -38,26 +43,28 @@ export const useSidebarLinkGroups = () => {
title: 'Order details',
items: [
{
id: 'order-history',
label: 'Order history',
link: { name: 'customer-order-history' },
},
{
id: 'my-reviews',
label: 'My reviews',
link: { name: 'customer-my-reviews' },
},
{
id: 'log-out',
label: 'Log out',
listeners: {
Copy link
Collaborator Author

@bartoszherba bartoszherba Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, if the component returns an object with a function inside, that function will be removed on the SRR, probably due to the serialization of the response. Only functions returned without containers are returned as expected.

click: async () => {
await logout({});
await clear({});
await router.push(localeRoute({ name: 'home' }));
},
},
},
],
},
];

return { sidebarLinkGroups };
const logoutUser = async () => {
await logout({});
await clear({});
await router.push(localeRoute({ name: 'home' }));
};

return { sidebarLinkGroups, logoutUser };
};