From 91ca910249c920074ae0e981127f68f872171f12 Mon Sep 17 00:00:00 2001 From: Thomas Schoffelen Date: Sun, 6 Oct 2024 13:04:09 +0100 Subject: [PATCH] fix: authenticatedFetch appending URLs --- packages/dashboard/src/components/auth/login.tsx | 14 ++++++++++++-- packages/dashboard/src/lib/api.ts | 2 +- packages/deploy-script/src/index.js | 2 +- packages/e2e-test/package.json | 2 +- turbo.json | 1 - 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/dashboard/src/components/auth/login.tsx b/packages/dashboard/src/components/auth/login.tsx index 7bc8c2d..e16e0a8 100644 --- a/packages/dashboard/src/components/auth/login.tsx +++ b/packages/dashboard/src/components/auth/login.tsx @@ -50,11 +50,21 @@ export const Login = ({}) => {
- +
- +
diff --git a/packages/dashboard/src/lib/api.ts b/packages/dashboard/src/lib/api.ts index 987607c..34f60fb 100644 --- a/packages/dashboard/src/lib/api.ts +++ b/packages/dashboard/src/lib/api.ts @@ -17,7 +17,7 @@ export const authenticatedFetch = async ( throw new Error("Unauthorized"); } - if (url.startsWith("/")) { + if (!url.includes("/api") && url.startsWith("/")) { url = `${BASE_URL}/api` + url; } diff --git a/packages/deploy-script/src/index.js b/packages/deploy-script/src/index.js index 967c37f..9a6c70b 100755 --- a/packages/deploy-script/src/index.js +++ b/packages/deploy-script/src/index.js @@ -68,7 +68,7 @@ const domain = answers.CUSTOM_DOMAIN || endpoint; console.log( "\n\n" + boxen( - `${chalk.green("Done!")} You can now access your TraceStack instance at \n${chalk.underline(chalk.bold(`https://${domain}`))}${adminPassword ? `\n\Username: admin\nPassword: ${adminPassword}` : ""}`, + `${chalk.green("Done!")} You can now access your TraceStack instance at \n${chalk.underline(chalk.bold(`https://${domain}`))}${adminPassword ? `\n\nUsername: admin\nPassword: ${adminPassword}` : ""}`, { padding: 1, borderStyle: "round" }, ), ); diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json index 9a3655c..c0d3f9e 100644 --- a/packages/e2e-test/package.json +++ b/packages/e2e-test/package.json @@ -3,7 +3,7 @@ "type": "module", "private": true, "scripts": { - "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest) --coverage" + "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest)" }, "devDependencies": { "@aws-sdk/client-dynamodb": "^3.658.1", diff --git a/turbo.json b/turbo.json index d445d50..ec56376 100644 --- a/turbo.json +++ b/turbo.json @@ -17,7 +17,6 @@ "inputs": ["$TURBO_DEFAULT$", ".env*"] }, "test:e2e": { - "dependsOn": ["build"], "inputs": ["$TURBO_DEFAULT$", ".env*"] }, "dev": {