Route asset public image URLs through facade
This commit is contained in:
@@ -10,7 +10,8 @@ import {
|
|||||||
scheduleHtmlThumbnail,
|
scheduleHtmlThumbnail,
|
||||||
} from './mindspace-thumbnails.mjs';
|
} from './mindspace-thumbnails.mjs';
|
||||||
import { removeZoneMirror, resolveUserWorkspaceRoot } from './user-space.mjs';
|
import { removeZoneMirror, resolveUserWorkspaceRoot } from './user-space.mjs';
|
||||||
import { PUBLIC_ZONE_DIR, PUBLISH_ROOT_DIR, resolvePublicBaseUrl } from './user-publish.mjs';
|
import { PUBLIC_ZONE_DIR, resolvePublicBaseUrl } from './user-publish.mjs';
|
||||||
|
import { createMindSpacePublicUrl } from './mindspace-canonical-url.mjs';
|
||||||
import {
|
import {
|
||||||
buildPublicImagePaths,
|
buildPublicImagePaths,
|
||||||
buildUserImagePublicUrl,
|
buildUserImagePublicUrl,
|
||||||
@@ -218,7 +219,11 @@ function publicTempImageStorageKey(userId, assetId, mimeType, fallbackFilename =
|
|||||||
|
|
||||||
function publicTempImageUrl(userId, assetId, mimeType, fallbackFilename = '') {
|
function publicTempImageUrl(userId, assetId, mimeType, fallbackFilename = '') {
|
||||||
const filename = publicTempImageFilename(assetId, mimeType, fallbackFilename);
|
const filename = publicTempImageFilename(assetId, mimeType, fallbackFilename);
|
||||||
return `${resolvePublicBaseUrl()}/${PUBLISH_ROOT_DIR}/${encodeURIComponent(userId)}/${PUBLIC_ZONE_DIR}/${PUBLIC_TEMP_IMAGE_DIR}/${encodeURIComponent(filename)}`;
|
return createMindSpacePublicUrl({
|
||||||
|
publicBaseUrl: resolvePublicBaseUrl(),
|
||||||
|
ownerKey: userId,
|
||||||
|
relativePath: `${PUBLIC_ZONE_DIR}/${PUBLIC_TEMP_IMAGE_DIR}/${filename}`,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function assetResponse(row) {
|
function assetResponse(row) {
|
||||||
|
|||||||
Reference in New Issue
Block a user