@graphcommerce/magento-customer 8.0.3-canary.0 → 8.0.3-canary.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 8.0.3-canary.2
+
+### Patch Changes
+
+- [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`3fbf3da`](https://github.com/graphcommerce-org/graphcommerce/commit/3fbf3da8a67f2fbaa7fa974a37cbbf34613844e4) - Solve an issue where the user would be presented with the Session expired dialog when the user would be logging in during the checkout process.
+  ([@paales](https://github.com/paales))
+
+## 8.0.3-canary.1
+
+### Patch Changes
+
+- [#2207](https://github.com/graphcommerce-org/graphcommerce/pull/2207) [`4d7594c`](https://github.com/graphcommerce-org/graphcommerce/commit/4d7594ca2174f74bfa9f66a464b77b3fd04f3560) - After changing the default shipping or billing address in the account section other address would not properly update
+  ([@paales](https://github.com/paales))
+
 ## 8.0.3-canary.0
 
 ## 8.0.2

package/components/SignInForm/SignInForm.tsx

@@ -1,37 +1,17 @@
 import { PasswordElement } from '@graphcommerce/ecommerce-ui'
-import { useApolloClient } from '@graphcommerce/graphql'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { Button, FormRow, FormActions } from '@graphcommerce/next-ui'
-import { useFormGqlMutation } from '@graphcommerce/react-hook-form'
 import { Trans } from '@lingui/react'
 import { Box, FormControl, Link, SxProps, Theme } from '@mui/material'
-import { CustomerDocument } from '../../hooks'
+import { useSignInForm } from '../../hooks/useSignInForm'
 import { ApolloCustomerErrorAlert } from '../ApolloCustomerError/ApolloCustomerErrorAlert'
-import { SignInDocument } from './SignIn.gql'
-import { signOut } from '../SignOutForm/signOut'
 
 export type SignInFormProps = { email: string; sx?: SxProps<Theme> }
 
 export function SignInForm(props: SignInFormProps) {
   const { email, sx } = props
-  const client = useApolloClient()
-  const form = useFormGqlMutation(
-    SignInDocument,
-    {
-      defaultValues: { email },
-      onBeforeSubmit: async (values) => {
-        const oldEmail = client.cache.readQuery({ query: CustomerDocument })?.customer?.email
 
-        /**
-         * We are logging in because the session expired, but we're logging in with a different
-         * email address, we need to reset the store.
-         */
-        if (oldEmail && oldEmail !== email) signOut(client)
-        return { ...values, email }
-      },
-    },
-    { errorPolicy: 'all' },
-  )
+  const form = useSignInForm({ email })
 
   const { handleSubmit, required, formState, error, control } = form
   const [remainingError, authError] = graphqlErrorByCategory({

package/components/UpdateDefaultAddressForm/UpdateDefaultAddressForm.tsx

@@ -26,7 +26,7 @@ export function UpdateDefaultAddressForm(props: UpdateDefaultAddressFormProps) {
   const form = useFormGqlMutation(
     UpdateDefaultAddressDocument,
     { mode: 'onChange', defaultValues },
-    { errorPolicy: 'all' },
+    { errorPolicy: 'all', refetchQueries: ['AccountDashboardAddresses'] },
   )
 
   const { handleSubmit, control, error, reset, formState } = form

package/hooks/CustomerToken.graphqls

@@ -3,6 +3,6 @@ extend type Query {
 }
 
 extend type CustomerToken {
-  createdAt: String
+  createdAt: String @deprecated(reason: "Value is not used in GraphCommerce, but still filled in.")
   valid: Boolean
 }

package/hooks/useSignInForm.ts

@@ -0,0 +1,44 @@
+import { useApolloClient } from '@graphcommerce/graphql'
+import { UseFormGraphQlOptions, useFormGqlMutation } from '@graphcommerce/react-hook-form'
+import {
+  SignInDocument,
+  SignInMutation,
+  SignInMutationVariables,
+} from '../components/SignInForm/SignIn.gql'
+import { signOut } from '../components/SignOutForm/signOut'
+import { CustomerDocument } from './Customer.gql'
+
+type UseSignInFormProps = {
+  email: string
+} & UseFormGraphQlOptions<SignInMutation, SignInMutationVariables>
+
+/**
+ * To extend the actions that happen after a successful sign in, you can use the `onComplete` option.
+ *
+ * @example @graphcommerce/magento-cart/plugins/useSignInFormMergeCart
+ */
+export function useSignInForm({ email, ...options }: UseSignInFormProps) {
+  const client = useApolloClient()
+
+  return useFormGqlMutation(
+    SignInDocument,
+    {
+      ...options,
+      defaultValues: { email, ...options?.defaultValues },
+      onBeforeSubmit: async (values) => {
+        const oldEmail = client.cache.readQuery({ query: CustomerDocument })?.customer?.email
+
+        /**
+         * We are logging in because the session expired, but we're logging in with a different
+         * email address, we need to reset the store.
+         */
+        if (oldEmail && oldEmail !== email) signOut(client)
+
+        return options?.onBeforeSubmit
+          ? options.onBeforeSubmit({ ...values, email })
+          : { ...values, email }
+      },
+    },
+    { errorPolicy: 'all' },
+  )
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-customer",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.3-canary.0",
+  "version": "8.0.3-canary.2",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,19 +12,19 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.0.3-canary.0",
-    "@graphcommerce/eslint-config-pwa": "^8.0.3-canary.0",
-    "@graphcommerce/framer-next-pages": "^8.0.3-canary.0",
-    "@graphcommerce/framer-utils": "^8.0.3-canary.0",
-    "@graphcommerce/graphql": "^8.0.3-canary.0",
-    "@graphcommerce/graphql-mesh": "^8.0.3-canary.0",
-    "@graphcommerce/image": "^8.0.3-canary.0",
-    "@graphcommerce/magento-graphql": "^8.0.3-canary.0",
-    "@graphcommerce/magento-store": "^8.0.3-canary.0",
-    "@graphcommerce/next-ui": "^8.0.3-canary.0",
-    "@graphcommerce/prettier-config-pwa": "^8.0.3-canary.0",
-    "@graphcommerce/react-hook-form": "^8.0.3-canary.0",
-    "@graphcommerce/typescript-config-pwa": "^8.0.3-canary.0",
+    "@graphcommerce/ecommerce-ui": "^8.0.3-canary.2",
+    "@graphcommerce/eslint-config-pwa": "^8.0.3-canary.2",
+    "@graphcommerce/framer-next-pages": "^8.0.3-canary.2",
+    "@graphcommerce/framer-utils": "^8.0.3-canary.2",
+    "@graphcommerce/graphql": "^8.0.3-canary.2",
+    "@graphcommerce/graphql-mesh": "^8.0.3-canary.2",
+    "@graphcommerce/image": "^8.0.3-canary.2",
+    "@graphcommerce/magento-graphql": "^8.0.3-canary.2",
+    "@graphcommerce/magento-store": "^8.0.3-canary.2",
+    "@graphcommerce/next-ui": "^8.0.3-canary.2",
+    "@graphcommerce/prettier-config-pwa": "^8.0.3-canary.2",
+    "@graphcommerce/react-hook-form": "^8.0.3-canary.2",
+    "@graphcommerce/typescript-config-pwa": "^8.0.3-canary.2",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",