Merge pull request #603 from TaloDev/develop

Release 0.87.1

Author: tudddorrr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "game-services",
-  "version": "0.87.0",
+  "version": "0.87.1",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

package.json

@@ -145,7 +145,7 @@ export default class UserPublicService extends Service {
     const { email, password } = req.body
     const em: EntityManager = req.ctx.em
 
-    const user = await em.getRepository(User).findOne({ email })
+    const user = await em.getRepository(User).findOne({ email }, { populate: ['organisation.games'] })
     if (!user) this.handleFailedLogin(req)
 
     const passwordMatches = await bcrypt.compare(password, user!.password)
@@ -185,7 +185,12 @@ export default class UserPublicService extends Service {
     const userAgent = req.headers['user-agent']
     const em: EntityManager = req.ctx.em
 
-    const session = await em.getRepository(UserSession).findOne({ token, userAgent }, { populate: ['user'] })
+    const session = await em.getRepository(UserSession).findOne({
+      token,
+      userAgent
+    }, {
+      populate: ['user.organisation.games']
+    })
 
     if (!session) {
       req.ctx.throw(401, 'Session not found')