@graphcommerce/magento-customer 8.0.0 → 8.0.1-canary.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 8.0.1-canary.0
+
+### Patch Changes
+
+- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`09a2cc3`](https://github.com/graphcommerce-org/graphcommerce/commit/09a2cc35ceb5e714ffd02e573eebe7de842ae327) - Do not try to automatically invalidate the current token and fully rely on the Session Expired dialog
+  ([@paales](https://github.com/paales))
+
+- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`ee969bf`](https://github.com/graphcommerce-org/graphcommerce/commit/ee969bfc5415392747b04e0484685f5c611a2559) - After signing out the currentCartId was still returning a value causing the cart to be shown after signing out
+  ([@paales](https://github.com/paales))
+
 ## 8.0.0
 
 ### Minor Changes

package/components/SignOutForm/signOut.ts

@@ -1,9 +1,10 @@
 import { ApolloClient } from '@graphcommerce/graphql'
 
 export function signOut(client: ApolloClient<object>) {
-  client.cache.evict({ fieldName: 'currentCartId', broadcast: true })
-  client.cache.evict({ fieldName: 'cart', broadcast: true })
-  client.cache.evict({ fieldName: 'customerToken', broadcast: true })
-  client.cache.evict({ fieldName: 'customer', broadcast: true })
-  client.cache.evict({ fieldName: 'customerCart', broadcast: true })
+  client.cache.evict({ fieldName: 'currentCartId' })
+  client.cache.evict({ fieldName: 'cart' })
+  client.cache.evict({ fieldName: 'customerToken' })
+  client.cache.evict({ fieldName: 'customer' })
+  client.cache.evict({ fieldName: 'customerCart' })
+  client.cache.gc()
 }

package/package.json

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

package/typePolicies.ts

@@ -1,53 +1,31 @@
 import type { FieldPolicy, MigrateCache, StrictTypedTypePolicies } from '@graphcommerce/graphql'
-import type { CustomerToken, Mutation } from '@graphcommerce/graphql-mesh'
+import type { Mutation } from '@graphcommerce/graphql-mesh'
 import { CustomerTokenDocument } from './hooks/CustomerToken.gql'
-import { IsEmailAvailableDocument } from './hooks/IsEmailAvailable.gql'
-
-const TOKEN_EXPIRATION_MS = 60 * 60 * 1000
-
-const valid: FieldPolicy<CustomerToken['valid']> = {
-  read(existing, options) {
-    if (existing === undefined) return existing
-
-    const ref = options.toReference({ __ref: 'CustomerToken' })
-    const createdAt = options.readField<string>('createdAt', ref)
-
-    if (!createdAt) return existing
-
-    return new Date().getTime() - new Date(createdAt).getTime() < TOKEN_EXPIRATION_MS
-  },
-}
 
 const generateCustomerToken: FieldPolicy<Mutation['generateCustomerToken']> = {
   keyArgs: () => '',
   merge(_existing, incoming, options) {
     if (!options.isReference(incoming)) return incoming
 
-    const write = () => {
-      options.cache.writeQuery({
-        query: CustomerTokenDocument,
-        broadcast: true,
-        data: {
-          customerToken: {
-            __typename: 'CustomerToken',
-            token: options.readField('token', incoming) as string,
-            createdAt: new Date().toUTCString(),
-            valid: true,
-          },
+    options.cache.writeQuery({
+      query: CustomerTokenDocument,
+      broadcast: true,
+      data: {
+        customerToken: {
+          __typename: 'CustomerToken',
+          token: options.readField('token', incoming) as string,
+          createdAt: new Date().toUTCString(),
+          valid: true,
         },
-      })
-    }
-    write()
+      },
+    })
 
-    // Broadcasts the query after the token expiration so UI gets updated
-    setTimeout(write, TOKEN_EXPIRATION_MS)
     return incoming
   },
 }
 
 export const customerTypePolicies: StrictTypedTypePolicies = {
   Mutation: { fields: { generateCustomerToken } },
-  CustomerToken: { fields: { valid } },
 }
 
 export const migrateCustomer: MigrateCache = (oldCache, newCache) => {