sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2025-12-11 03:34:35 +00:00
Code Issues Projects Releases Wiki Activity

test: fixed failed specs

Browse Source
This commit is contained in:
Saad Jutt
2022-08-04 04:01:51 +05:00
parent 5966016853
commit 18052fdbf6
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/src/routes/api/spec/web.spec.ts
View File

@@ -39,12 +39,11 @@ describe('web', () => {
describe('home', () => { describe('home', () => {
it('should respond with CSRF Token', async () => { it('should respond with CSRF Token', async () => {
await request(app) const res = await request(app).get('/').expect(200)
.get('/')
.expect( expect(res.text).toMatch(
'set-cookie', /<script>document.cookie = '(XSRF-TOKEN=.*; Max-Age=86400; SameSite=Strict; Path=\/;)'<\/script>/
/_csrf=.*; Max-Age=86400000; Path=\/; HttpOnly,XSRF-TOKEN=.*; Path=\// )
)
}) })
}) })
@@ -154,10 +153,10 @@ describe('web', () => {
const getCSRF = async (app: Express) => { const getCSRF = async (app: Express) => {
// make request to get CSRF // make request to get CSRF
const { header } = await request(app).get('/') const { header, text } = await request(app).get('/')
const cookies = header['set-cookie'].join() const cookies = header['set-cookie'].join()
const csrfToken = extractCSRF(cookies) const csrfToken = extractCSRF(text)
return { csrfToken, cookies } return { csrfToken, cookies }
} }
@@ -177,7 +176,7 @@ const performLogin = async (
return { cookies: newCookies } return { cookies: newCookies }
} }
const extractCSRF = (cookies: string) => const extractCSRF = (text: string) =>
/_csrf=(.*); Max-Age=86400000; Path=\/; HttpOnly,XSRF-TOKEN=(.*); Path=\//.exec( /<script>document.cookie = 'XSRF-TOKEN=(.*); Max-Age=86400; SameSite=Strict; Path=\/;'<\/script>/.exec(
cookies text
)![2] )![1]

2
web/src/context/appContext.tsx
View File

@@ -86,7 +86,7 @@ const AppContextProvider = (props: { children: ReactNode }) => {
.then((res) => res.data) .then((res) => res.data)
.then((data: string) => { .then((data: string) => {
const result = const result =
/<script>document.cookie = '(XSRF-TOKEN=[A-Za-z-0-9; =/]*)'<\/script>/.exec( /<script>document.cookie = '(XSRF-TOKEN=.*; Max-Age=86400; SameSite=Strict; Path=\/;)'<\/script>/.exec(
data data
)?.[1] )?.[1]