diff --git a/api/src/routes/api/spec/web.spec.ts b/api/src/routes/api/spec/web.spec.ts index f442432..12da618 100644 --- a/api/src/routes/api/spec/web.spec.ts +++ b/api/src/routes/api/spec/web.spec.ts @@ -20,14 +20,11 @@ describe('web', () => { let app: Express let con: Mongoose let mongoServer: MongoMemoryServer - let csrfToken: string - let cookies: string const userController = new UserController() const clientController = new ClientController() beforeAll(async () => { app = await appPromise - ;({ csrfToken, cookies } = await getCSRF(app)) mongoServer = await MongoMemoryServer.create() con = await mongoose.connect(mongoServer.getUri()) @@ -50,7 +47,15 @@ describe('web', () => { ) }) }) + describe('SASLogon/login', () => { + let csrfToken: string + let cookies: string + + beforeAll(async () => { + ;({ csrfToken, cookies } = await getCSRF(app)) + }) + afterEach(async () => { const collections = mongoose.connection.collections const collection = collections['users'] @@ -79,9 +84,13 @@ describe('web', () => { }) describe('SASLogon/authorize', () => { + let csrfToken: string + let cookies: string let authCookies: string beforeAll(async () => { + ;({ csrfToken, cookies } = await getCSRF(app)) + await userController.createUser(user) const credentials = { @@ -146,6 +155,7 @@ const getCSRF = async (app: Express) => { const { header } = await request(app).get('/') const cookies = header['set-cookie'].join() + console.log('cookies', cookies) const csrfToken = extractCSRF(cookies) return { csrfToken, cookies } } diff --git a/api/src/routes/web/web.ts b/api/src/routes/web/web.ts index 376cc9c..c64478f 100644 --- a/api/src/routes/web/web.ts +++ b/api/src/routes/web/web.ts @@ -7,14 +7,15 @@ const webRouter = express.Router() const controller = new WebController() webRouter.get('/', async (req, res) => { + let response try { - const response = await controller.home() - + response = await controller.home() + } catch (_) { + response = 'Web Build is not present' + } finally { res.cookie('XSRF-TOKEN', req.csrfToken()) return res.send(response) - } catch (_) { - return res.send('Web Build is not present') } })