fix(core): Fix bug where session user in cache would get removed

vendure-ecommerce · Jul 16, 2020 · ebec0f0 · ebec0f0
1 parent fa5caf5
commit ebec0f0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/core/src/service/services/session.service.ts b/packages/core/src/service/services/session.service.ts
@@ -167,7 +167,9 @@ export class SessionService implements EntitySubscriberInterface {
     }
 
     async setActiveOrder(serializedSession: CachedSession, order: Order): Promise<CachedSession> {
-        const session = await this.connection.getRepository(Session).findOne(serializedSession.id);
+        const session = await this.connection
+            .getRepository(Session)
+            .findOne(serializedSession.id, { relations: ['user', 'user.roles', 'user.roles.channels'] });
         if (session) {
             session.activeOrder = order;
             await this.connection.getRepository(Session).save(session, { reload: false });
@@ -182,10 +184,14 @@ export class SessionService implements EntitySubscriberInterface {
         if (serializedSession.activeOrderId) {
             const session = await this.connection
                 .getRepository(Session)
-                .save({ id: serializedSession.id, activeOrder: null });
-            const updatedSerializedSession = this.serializeSession(session);
-            await this.configService.authOptions.sessionCacheStrategy.set(updatedSerializedSession);
-            return updatedSerializedSession;
+                .findOne(serializedSession.id, { relations: ['user', 'user.roles', 'user.roles.channels'] });
+            if (session) {
+                session.activeOrder = null;
+                await this.connection.getRepository(Session).save(session);
+                const updatedSerializedSession = this.serializeSession(session);
+                await this.configService.authOptions.sessionCacheStrategy.set(updatedSerializedSession);
+                return updatedSerializedSession;
+            }
         }
         return serializedSession;
     }