add orders to useUser composable

packages/commercetools/api-client/src/api/getMe/defaultQuery.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { CartFragment, CustomerFragment } from './../../fragments';
+import { CartFragment, CustomerFragment, OrderFragment } from './../../fragments';
 
 const basicProfile = gql`
   ${CartFragment}
@@ -16,6 +16,7 @@ const basicProfile = gql`
 const fullProfile = gql`
   ${CartFragment}
   ${CustomerFragment}
+  ${OrderFragment}
 
   query getMe($locale: Locale!) {
     me {
@@ -25,6 +26,11 @@ const fullProfile = gql`
       customer {
         ...DefaultCustomer
       }
+      orders {
+        results {
+          ...DefaultOrder
+        }
+      }
     }
   }
 `;

packages/commercetools/composables/src/useUser/index.ts

@@ -1,6 +1,6 @@
 import { ref, Ref, watch, computed } from '@vue/composition-api';
 import { UseUser, AgnosticUserLogin, AgnosticUserRegister } from '@vue-storefront/interfaces';
-import { Customer, CustomerSignMeUpDraft, CustomerSignMeInDraft } from '@vue-storefront/commercetools-api/lib/src/types/GraphQL';
+import { Customer, CustomerSignMeUpDraft, CustomerSignMeInDraft, Order } from '@vue-storefront/commercetools-api/lib/src/types/GraphQL';
 import {
   customerSignMeUp,
   customerSignMeIn,
@@ -9,13 +9,13 @@ import {
 } from '@vue-storefront/commercetools-api';
 import { cart } from './../useCart';
 
-type UserRef = Ref<Customer>
 type RegisterFn = (userData: AgnosticUserRegister) => Promise<void>
 type LoginFn = (userData: AgnosticUserLogin) => Promise<void>
 type LogoutFn = () => Promise<void>
 type UserData = CustomerSignMeUpDraft | CustomerSignMeInDraft
 
-const user: UserRef = ref({});
+const user: Ref<Customer> = ref({});
+const orders: Ref<Order[]> = ref([]);
 const loading = ref(false);
 const error = ref(null);
 const isAuthenticated = computed(() => user.value && Object.keys(user.value).length > 0);
@@ -33,7 +33,7 @@ const authenticate = async (userData: UserData, fn) => {
   loading.value = false;
 };
 
-export default function useUser(): UseUser<UserRef, RegisterFn, LoginFn, LogoutFn> {
+export default function useUser(): UseUser<Ref<Customer>, RegisterFn, LoginFn, LogoutFn, Ref<Order[]>> {
   watch(user, async () => {
     if (isAuthenticated.value) {
       return;
@@ -44,7 +44,9 @@ export default function useUser(): UseUser<UserRef, RegisterFn, LoginFn, LogoutF
     try {
       const profile = await getMe({ customer: true });
       user.value = profile.data.me.customer;
-    } catch (err) {} // eslint-disable-line
+      orders.value = profile.data.me.orders.results;
+    // eslint-disable-next-line no-empty
+    } catch (err) {}
 
     loading.value = false;
   });
@@ -67,6 +69,7 @@ export default function useUser(): UseUser<UserRef, RegisterFn, LoginFn, LogoutF
 
   return {
     user,
+    orders,
     register,
     login,
     logout,

packages/commercetools/composables/tests/useUser/useUser.spec.ts

@@ -6,8 +6,19 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
   customerSignMeUp: jest.fn(),
   customerSignMeIn: jest.fn(),
   customerSignOut: jest.fn(),
-  getMe: () => ({ data: { me: { customer: { firstName: 'loaded customer',
-    lastName: 'loaded customer' } } } })
+  getMe: () => ({
+    data: {
+      me: {
+        customer: {
+          firstName: 'loaded customer',
+          lastName: 'loaded customer'
+        },
+        orders: {
+          results: []
+        }
+      }
+    }
+  })
 }));
 
 describe('[commercetools-composables] useUser', () => {
@@ -16,8 +27,12 @@ describe('[commercetools-composables] useUser', () => {
   });
 
   it('registers new customer', async () => {
-    const user = { customer: { firstName: 'john',
-      lastName: 'doe' } };
+    const user = {
+      customer: {
+        firstName: 'john',
+        lastName: 'doe'
+      }
+    };
     (customerSignMeUp as any).mockReturnValue(Promise.resolve({ data: { user } }));
 
     const wrapper = mountComposable(useUser);
@@ -33,16 +48,22 @@ describe('[commercetools-composables] useUser', () => {
   });
 
   it('login customer and log out', async () => {
-    const user = { customer: { firstName: 'john',
-      lastName: 'doe' } };
+    const user = {
+      customer: {
+        firstName: 'john',
+        lastName: 'doe'
+      }
+    };
     (customerSignMeIn as any).mockReturnValue(Promise.resolve({ data: { user } }));
 
     const wrapper = mountComposable(useUser);
     await wrapper.vm.$nextTick();
     await wrapper.vm.$nextTick();
 
-    wrapper.vm.$data.login({ email: '[email protected]',
-      password: '123' });
+    wrapper.vm.$data.login({
+      email: '[email protected]',
+      password: '123'
+    });
 
     expect(wrapper.vm.$data.loading).toBeTruthy();
     await wrapper.vm.$nextTick();
@@ -71,4 +92,12 @@ describe('[commercetools-composables] useUser', () => {
       lastName: 'loaded customer'
     });
   });
+
+  it('loads current customer with orders', async () => {
+    const wrapper = mountComposable(useUser);
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.$data.orders).toEqual([]);
+  });
+
 });

packages/core/interfaces/index.ts

@@ -14,8 +14,10 @@ export interface UseUser
   REGISTER,
   LOGIN,
   LOGOUT,
+  ORDERS
 > {
   user: USER;
+  orders: ORDERS;
   register: REGISTER;
   login: LOGIN;
   logout: LOGOUT;