diff --git a/backend/src/app/http/middleware.clj b/backend/src/app/http/middleware.clj index feb07afb50..95cc15e290 100644 --- a/backend/src/app/http/middleware.clj +++ b/backend/src/app/http/middleware.clj @@ -213,14 +213,14 @@ (assoc "access-control-allow-origin" origin) (assoc "access-control-allow-methods" "GET,POST,DELETE,OPTIONS,PUT,HEAD,PATCH") (assoc "access-control-allow-credentials" "true") - (assoc "access-control-expose-headers" "x-requested-with, content-type, cookie") - (assoc "access-control-allow-headers" "x-frontend-version, content-type, accept, x-requested-width"))) + (assoc "access-control-expose-headers" "content-type, set-cookie") + (assoc "access-control-allow-headers" "x-frontend-version, x-client, x-requested-width, content-type, accept, cookie"))) (defn wrap-cors [handler] (fn [request] (let [response (if (= (yreq/method request) :options) - {::yres/status 200} + {::yres/status 204} (handler request)) origin (yreq/get-header request "origin")] (update response ::yres/headers with-cors-headers origin)))) diff --git a/plugins/apps/e2e/src/plugins.spec.ts b/plugins/apps/e2e/src/plugins.spec.ts index 79ff7748b9..2246e31a1f 100644 --- a/plugins/apps/e2e/src/plugins.spec.ts +++ b/plugins/apps/e2e/src/plugins.spec.ts @@ -11,7 +11,7 @@ import comments from './plugins/create-comments'; import { Agent } from './utils/agent'; describe('Plugins', () => { - it('create board - text - rectable', async () => { + it.only('create board - text - rectable', async () => { const agent = await Agent(); const result = await agent.runCode(testingPlugin.toString(), { screenshot: 'create-board-text-rect', diff --git a/plugins/apps/e2e/src/utils/agent.ts b/plugins/apps/e2e/src/utils/agent.ts index 0093cc64ce..310fca41e2 100644 --- a/plugins/apps/e2e/src/utils/agent.ts +++ b/plugins/apps/e2e/src/utils/agent.ts @@ -60,6 +60,9 @@ export async function Agent() { const page = await browser.newPage(); await page.setViewport({ width: 1920, height: 1080 }); + await page.setExtraHTTPHeaders({ + 'X-Client': 'plugins/e2e:puppeter', + }); console.log('Setting authentication cookie...'); page.setCookie({ diff --git a/plugins/apps/e2e/src/utils/api.ts b/plugins/apps/e2e/src/utils/api.ts index 78355626db..2ffa62562d 100644 --- a/plugins/apps/e2e/src/utils/api.ts +++ b/plugins/apps/e2e/src/utils/api.ts @@ -10,6 +10,7 @@ export async function PenpotApi() { const resultLoginRequest = await fetch( `${apiUrl}/api/rpc/command/login-with-password`, { + credentials: 'include', method: 'POST', headers: { 'Content-Type': 'application/transit+json', @@ -21,7 +22,15 @@ export async function PenpotApi() { }, ); + console.log("AAAAAAAAAAAA", 1, apiUrl) + // console.log("AAAAAAAAAAAA", 2, resultLoginRequest); + + console.dir(resultLoginRequest.headers, {depth:20}); + console.log('Document Cookies:', window.document.cookie); + const loginData = await resultLoginRequest.json(); + + const authToken = resultLoginRequest.headers .get('set-cookie') ?.split(';') diff --git a/plugins/apps/e2e/vite.config.ts b/plugins/apps/e2e/vite.config.ts index ac46a55bd9..defb76d2a9 100644 --- a/plugins/apps/e2e/vite.config.ts +++ b/plugins/apps/e2e/vite.config.ts @@ -14,6 +14,6 @@ export default defineConfig({ reportsDirectory: '../coverage/e2e', provider: 'v8', }, - setupFiles: ['dotenv/config'], + setupFiles: ['dotenv/config', 'vitest.setup.ts'] }, }); diff --git a/plugins/apps/e2e/vitest.setup.ts b/plugins/apps/e2e/vitest.setup.ts new file mode 100644 index 0000000000..79bc7c2e15 --- /dev/null +++ b/plugins/apps/e2e/vitest.setup.ts @@ -0,0 +1,3 @@ +// import { vi } from 'vitest'; + +window.location.href = 'https://localhost:3449'; \ No newline at end of file