Skip to content

Commit a70ea6b

Browse files
authored
fix(core): Update validation for session when using relationLoadStrategy query (#3691)
1 parent 127b76b commit a70ea6b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/core/src/service/services/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class AuthService {
100100
await this.sessionService.deleteSessionsByActiveOrderId(ctx, ctx.session.activeOrderId);
101101
}
102102
user.lastLogin = new Date();
103-
await this.connection.getRepository(ctx, User).save(user, { reload: false });
103+
await this.connection.getRepository(ctx, User).save(user);
104104
const session = await this.sessionService.createNewAuthenticatedSession(
105105
ctx,
106106
user,

packages/core/src/service/services/session.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,6 @@ export class SessionService implements EntitySubscriberInterface, OnApplicationB
398398
}
399399

400400
private isAuthenticatedSession(session: Session): session is AuthenticatedSession {
401-
return session.hasOwnProperty('user');
401+
return session.hasOwnProperty('user') && !!(session as AuthenticatedSession).user;
402402
}
403403
}

0 commit comments

Comments
 (0)