Return headers from login/registerAccount test methods

packages/server/src/routes/AuthRoutes.test.ts

@@ -26,9 +26,7 @@ describe('/auth', () => {
     const t = test.request('/api')
     beforeEach(async () => {
       const session = await test.registerAccount()
-      const token = session.token
-      const cookie = session.cookie
-      t.setHeaders({cookie, 'x-csrf-token': token})
+      t.setHeaders(session.headers)
     })
 
     it('should prevent access when user not logged in', async () => {
@@ -64,7 +62,7 @@ describe('/auth', () => {
     let cookie!: string
     beforeEach(async () => {
       await test.registerAccount()
-      cookie = (await test.login()).cookie
+      cookie = (await test.login()).headers.cookie
     })
 
     it('should log out the user', async () => {

packages/server/src/routes/UserRoutes.test.ts

@@ -6,13 +6,11 @@ describe('user', () => {
   const t = test.request('/api')
 
   let cookie!: string
-  let token!: string
   beforeEach(async () => {
     await test.registerAccount()
     const session = await test.login()
-    cookie = session.cookie
-    token = session.token
-    t.setHeaders({ cookie, 'x-csrf-token': token })
+    cookie = session.headers.cookie
+    t.setHeaders(session.headers)
   })
 
   describe('GET /users/profile', () => {

packages/server/src/rpc/UserService.test.ts

@@ -5,15 +5,10 @@ describe('user', () => {
 
   test.withDatabase()
 
-  let cookie!: string
-  let token!: string
   let headers: Record<string, string> = {}
   beforeEach(async () => {
     await test.registerAccount()
-    const session = await test.login()
-    cookie = session.cookie
-    token = session.token
-    headers = {cookie, 'x-csrf-token': token}
+    headers = (await test.login()).headers
   })
 
   const createService = () => {

packages/server/src/team/TeamRoutes.test.ts

@@ -6,15 +6,11 @@ describe('team', () => {
   test.withDatabase()
   const t = test.request('/api')
 
-  let cookie!: string
-  let token!: string
   let mainUserId: number
   beforeEach(async () => {
     const session = await test.registerAccount()
-    cookie = session.cookie
-    token = session.token
     mainUserId = session.userId
-    t.setHeaders({ cookie, 'x-csrf-token': token })
+    t.setHeaders(session.headers)
   })
 
   describe('POST /teams', () => {

packages/server/src/test-utils/TestUtils.ts

@@ -133,9 +133,11 @@ export class TestUtils<T extends IRoutes> {
     const cookies = this.getCookies(response.header['set-cookie'])
 
     return {
-      cookie: [cookies, cookie].join('; '),
+      headers: {
+        "cookie": [cookies, cookie].join('; '),
+        'x-csrf-token': token,
+      },
       userId: response.body.id,
-      token,
     }
   }
 
@@ -152,8 +154,10 @@ export class TestUtils<T extends IRoutes> {
     const cookies = this.getCookies(response.header['set-cookie'])
 
     return {
-      cookie: [cookies, cookie].join('; '),
-      token,
+      headers: {
+        "cookie": [cookies, cookie].join('; '),
+        'x-csrf-token': token,
+      },
     }
   }