fix(core): Fix bug which created new address for each order placed

packages/core/e2e/shop-order.e2e-spec.ts

@@ -360,6 +360,7 @@ describe('Shop orders', () => {
         });
 
         it('customer default Addresses are not updated before payment', async () => {
+            // TODO: will need to be reworked for https://github.com/vendure-ecommerce/vendure/issues/98
             const result = await shopClient.query<GetCustomerAddresses.Query>(GET_ACTIVE_ORDER_ADDRESSES);
 
             expect(result.activeOrder!.customer!.addresses).toEqual([]);
@@ -400,6 +401,7 @@ describe('Shop orders', () => {
         });
 
         it('customer default Addresses are updated after payment', async () => {
+            // TODO: will need to be reworked for https://github.com/vendure-ecommerce/vendure/issues/98
             const result = await adminClient.query<GetCustomer.Query, GetCustomer.Variables>(GET_CUSTOMER, {
                 id: createdCustomerId,
             });
@@ -769,6 +771,11 @@ describe('Shop orders', () => {
                     baz: 'quux',
                 });
             });
+
+            it('does not create new address when Customer already has address', async () => {
+                const { customer } = await adminClient.query<GetCustomer.Query, GetCustomer.Variables>(GET_CUSTOMER, { id: customers[0].id });
+                expect(customer!.addresses!.length).toBe(1);
+            });
         });
 
         describe('orderByCode', () => {

packages/core/src/api/resolvers/shop/shop-order.resolver.ts

@@ -3,15 +3,15 @@ import {
     MutationAddItemToOrderArgs,
     MutationAddPaymentToOrderArgs,
     MutationAdjustItemQuantityArgs,
-    Permission,
-    QueryOrderArgs,
-    QueryOrderByCodeArgs,
     MutationRemoveItemFromOrderArgs,
     MutationSetCustomerForOrderArgs,
     MutationSetOrderShippingAddressArgs,
     MutationSetOrderShippingMethodArgs,
-    ShippingMethodQuote,
     MutationTransitionOrderToStateArgs,
+    Permission,
+    QueryOrderArgs,
+    QueryOrderByCodeArgs,
+    ShippingMethodQuote,
 } from '@vendure/common/lib/generated-shop-types';
 import { QueryCountriesArgs } from '@vendure/common/lib/generated-types';
 import ms from 'ms';
@@ -226,19 +226,21 @@ export class ShopOrderResolver {
             if (sessionOrder) {
                 const order = await this.orderService.addPaymentToOrder(ctx, sessionOrder.id, args.input);
                 if (order.active === false) {
-                    const { customer } = order;
-                    // If the Customer has no addresses yet, use the shipping address data
-                    // to populate the initial default Address.
-                    if (customer && (!customer.addresses || customer.addresses.length === 0)) {
-                        const address = order.shippingAddress;
-                        await this.customerService.createAddress(ctx, customer.id as string, {
-                            ...address,
-                            streetLine1: address.streetLine1 || '',
-                            streetLine2: address.streetLine2 || '',
-                            countryCode: address.countryCode || '',
-                            defaultBillingAddress: true,
-                            defaultShippingAddress: true,
-                        });
+                    if (order.customer) {
+                        const addresses = await this.customerService.findAddressesByCustomerId(ctx, order.customer.id);
+                        // If the Customer has no addresses yet, use the shipping address data
+                        // to populate the initial default Address.
+                        if (addresses.length === 0) {
+                            const address = order.shippingAddress;
+                            await this.customerService.createAddress(ctx, order.customer.id as string, {
+                                ...address,
+                                streetLine1: address.streetLine1 || '',
+                                streetLine2: address.streetLine2 || '',
+                                countryCode: address.countryCode || '',
+                                defaultBillingAddress: true,
+                                defaultShippingAddress: true,
+                            });
+                        }
                     }
                 }
                 if (
@@ -276,6 +278,12 @@ export class ShopOrderResolver {
             throw new InternalServerError(`error.no-active-session`);
         }
         let order = ctx.session.activeOrder;
+        if (order && order.active === false) {
+            // edge case where an inactive order may not have been
+            // removed from the session, i.e. the regular process was interrupted
+            await this.authService.unsetActiveOrder(ctx.session);
+            order = null;
+        }
         if (!order) {
             if (ctx.activeUserId) {
                 order = (await this.orderService.getActiveOrderForUser(ctx, ctx.activeUserId)) || null;