yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-11 07:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

strip a single trailing slash from admin url

Browse Source
This commit is contained in:
Ben Irvin 2023-03-29 08:53:06 +02:00
parent 49d32d001b
commit 7fbad9fb9d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts
View File

@ -210,7 +210,10 @@ class RemoteStrapiDestinationProvider implements IDestinationProvider {
}); });
} }
const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:'; const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
const wsUrl = `${wsProtocol}//${url.host}${url.pathname}${TRANSFER_PATH}/push`; const wsUrl = `${wsProtocol}//${url.host}${url.pathname.replace(
/\/$/,
''
)}${TRANSFER_PATH}/push`;
// No auth defined, trying public access for transfer // No auth defined, trying public access for transfer
if (!auth) { if (!auth) {

5
packages/core/data-transfer/src/strapi/providers/remote-source/index.ts
View File

@ -227,7 +227,10 @@ class RemoteStrapiSourceProvider implements ISourceProvider {
let ws: WebSocket; let ws: WebSocket;
this.assertValidProtocol(url); this.assertValidProtocol(url);
const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:'; const wsProtocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
const wsUrl = `${wsProtocol}//${url.host}${url.pathname}${TRANSFER_PATH}/pull`; const wsUrl = `${wsProtocol}//${url.host}${url.pathname.replace(
/\/$/,
''
)}${TRANSFER_PATH}/pull`;
// No auth defined, trying public access for transfer // No auth defined, trying public access for transfer
if (!auth) { if (!auth) {