feat: only follow serverUrlPrefix at redirect to client (#5295) (#5354)

feat: only follow `serverUrlPrefix` at redirect to client (#5295)

fix: use secure websocket (#5297)
This commit is contained in:
Joooye_34
2023-12-20 07:52:57 +00:00
parent 800ea0abf1
commit 80eeb2ddc7
7 changed files with 27 additions and 21 deletions
@@ -81,8 +81,7 @@ const snapshotFetcher = async (
return null;
}
const res = await fetchWithTraceReport(
runtimeConfig.serverUrlPrefix +
`/api/workspaces/${workspaceId}/docs/${pageDocId}/histories/${ts}`,
`/api/workspaces/${workspaceId}/docs/${pageDocId}/histories/${ts}`,
{
priority: 'high',
}
@@ -140,7 +140,9 @@ export const AffineSharePage = (props: ShareMenuProps) => {
lineHeight: '20px',
}}
value={
isSharedPage ? sharingUrl : `${runtimeConfig.serverUrlPrefix}/...`
isSharedPage
? sharingUrl
: `${location.protocol}//${location.hostname}/...`
}
readOnly
/>
@@ -19,8 +19,11 @@ export const generateUrl = ({
// to generate a public url like https://affine.app/share/123/456
// or https://affine.app/share/123/456?mode=edgeless
const { protocol, hostname, port } = window.location;
const url = new URL(
`${runtimeConfig.serverUrlPrefix}/${urlType}/${workspaceId}/${pageId}`
`${protocol}//${hostname}${
port ? `:${port}` : ''
}/${urlType}/${workspaceId}/${pageId}`
);
return url.toString();
};