diff --git a/src/common/utils.ts b/src/common/utils.ts index eacc758..b008f2c 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -138,7 +138,7 @@ export const _requestToCouchDBFetch = async ( authorization: authHeader, "content-type": "application/json", }; - const uri = `${baseUri}/${path}`; + const uri = `${baseUri.replace(/\/+$/, "")}/${path}`; const requestParam = { url: uri, method: method || (body ? "PUT" : "GET"), @@ -162,7 +162,7 @@ export const _requestToCouchDB = async ( const authHeaderGen = new AuthorizationHeaderGenerator(); const authHeader = await authHeaderGen.getAuthorizationHeader(credentials); const transformedHeaders: Record = { authorization: authHeader, origin: origin, ...customHeaders }; - const uri = `${baseUri}/${path}`; + const uri = `${baseUri.replace(/\/+$/, "")}/${path}`; const requestParam: RequestUrlParam = { url: uri, method: method || (body ? "PUT" : "GET"), diff --git a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts index 1f75385..fb8651c 100644 --- a/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts +++ b/src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts @@ -781,7 +781,8 @@ Success: ${successCount}, Errored: ${errored}`; const credential = generateCredentialObject(this.settings); const request = async (path: string, method: string = "GET", body: any = undefined) => { const req = await _requestToCouchDB( - this.settings.couchDB_URI + (this.settings.couchDB_DBNAME ? `/${this.settings.couchDB_DBNAME}` : ""), + this.settings.couchDB_URI.replace(/\/+$/, "") + + (this.settings.couchDB_DBNAME ? `/${this.settings.couchDB_DBNAME}` : ""), credential, window.origin, path,