From f066a8680339df21546379458cca36c3b51bd4ed Mon Sep 17 00:00:00 2001 From: Nikhil Harisinghani Date: Mon, 13 Jan 2025 15:36:40 +0000 Subject: [PATCH 1/2] NoMongo:Fixing the 404 issue even after having a running talawa-api --- src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts index 713ed7dc68..9ad4d73604 100644 --- a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts +++ b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts @@ -5,8 +5,8 @@ export async function askForTalawaApiUrl(): Promise { { type: 'input', name: 'endpoint', - message: 'Enter your talawa-api endpoint:', - default: 'http://localhost:4000/graphql/', + message: 'Enter your talawa-api endpoint:(omit the trailing "/")', + default: 'http://localhost:4000/graphql', }, ]); return endpoint; From 9b71393a49340256d9728aa5b334a8a75a85b946 Mon Sep 17 00:00:00 2001 From: Nikhil Harisinghani Date: Tue, 14 Jan 2025 13:41:36 +0000 Subject: [PATCH 2/2] Update : Change in script to improve user experience --- src/setup/askForDocker/askForDocker.ts | 3 +++ src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/setup/askForDocker/askForDocker.ts b/src/setup/askForDocker/askForDocker.ts index fa926839d4..5e5fdaff48 100644 --- a/src/setup/askForDocker/askForDocker.ts +++ b/src/setup/askForDocker/askForDocker.ts @@ -47,6 +47,9 @@ export const askAndUpdateTalawaApiUrl = async (): Promise => { while (!isConnected && retryCount < MAX_RETRIES) { try { endpoint = await askForTalawaApiUrl(); + if (endpoint.endsWith('/')) { + endpoint = endpoint.slice(0, -1); + } const url = new URL(endpoint); if (!['http:', 'https:'].includes(url.protocol)) { throw new Error('Invalid URL protocol. Must be http or https'); diff --git a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts index 9ad4d73604..2442169f5f 100644 --- a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts +++ b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts @@ -5,7 +5,7 @@ export async function askForTalawaApiUrl(): Promise { { type: 'input', name: 'endpoint', - message: 'Enter your talawa-api endpoint:(omit the trailing "/")', + message: 'Enter your talawa-api endpoint:', default: 'http://localhost:4000/graphql', }, ]);