Skip to content

refactor: fixed customer logging and authorization checking #1081

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
May 31, 2022
Merged

refactor: fixed customer logging and authorization checking #1081

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
2 changes: 1 addition & 1 deletion packages/theme/components/LoginModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
rules="required|email"
>
<SfInput
v-model="form.username"
v-model="form.email"
v-e2e="'login-modal-email'"
:valid="!errors[0]"
:error-message="$t(errors[0])"
Expand Down
15 changes: 0 additions & 15 deletions packages/theme/modules/customer/composables/useUser/loginStatusPingQuery.gql.ts
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/theme/plugins/__tests__/token-expired.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const appMockFactory = (callbackResponse, authResponse) => ({
},
config: {
state: {
getCustomerToken: jest.fn(),
removeCustomerToken: jest.fn(),
removeCartId: jest.fn(),
setMessage: jest.fn(),
Expand Down Expand Up @@ -65,6 +66,7 @@ describe('Token Expired plugin', () => {

it('sets initial login status', async () => {
const appMock = appMockFactory(validRes, validRes);
appMock.$vsf.$magento.config.state.getCustomerToken.mockReturnValue(true);
const customerStore = useCustomerStore();
jest.spyOn(customerStore, 'setIsLoggedIn');

Expand All @@ -75,6 +77,7 @@ describe('Token Expired plugin', () => {

it('doesn\'t set initial login status if not logged in', async () => {
const appMock = appMockFactory(validRes, errRes.data); // need .data because it's ApolloGraphQlResponse, not axios
appMock.$vsf.$magento.config.state.getCustomerToken.mockReturnValue(false);
const customerStore = useCustomerStore();

await tokenExpiredPlugin({ app: appMock });
Expand Down
7 changes: 2 additions & 5 deletions packages/theme/plugins/token-expired.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ import type { Plugin } from '@nuxt/types';
import type { ApolloQueryResult } from '@apollo/client/core/types';
import type { UiNotification } from '~/composables/useUiNotification';
import { useCustomerStore } from '~/modules/customer/stores/customer';
import loginStatusPingQueryGql from '~/modules/customer/composables/useUser/loginStatusPingQuery.gql';

export const hasGraphqlAuthorizationError = (res: ApolloQueryResult<unknown>) => res?.errors
?.some((error) => error.extensions.category === 'graphql-authorization') ?? false;

const plugin : Plugin = async ({ $pinia, app }) => {
const plugin : Plugin = ({ $pinia, app }) => {
const customerStore = useCustomerStore($pinia);

const responseOfLoginStatusPing = await app.$vsf.$magento.api.customQuery({ query: loginStatusPingQueryGql });
if (!hasGraphqlAuthorizationError(responseOfLoginStatusPing)) {
if (app.$vsf.$magento.config.state.getCustomerToken()) {
customerStore.setIsLoggedIn(true);
}

Expand Down