Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proxy content via public-api, even when we're on a simple site. #90895

Merged
merged 3 commits into from
May 24, 2024
Merged

Proxy content via public-api, even when we're on a simple site. #90895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9e230
Proxy content via public-api, even when we're on a simple site.
devicenull May 17, 2024
29b79c6
Do not try to use public-api proxy for non-wpcom sites
devicenull May 23, 2024
2740d2c
Cleanup code based on feedback
devicenull May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions client/blocks/image-editor/image-editor-canvas.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import {
isImageEditorImageLoaded,
} from 'calypso/state/editor/image-editor/selectors';
import getImageEditorIsGreaterThanMinimumDimensions from 'calypso/state/selectors/get-image-editor-is-greater-than-minimum-dimensions';
import isPrivateSite from 'calypso/state/selectors/is-private-site';
import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
import isJetpackSite from 'calypso/state/sites/selectors/is-jetpack-site';
import getSelectedSiteId from 'calypso/state/ui/selectors/get-selected-site-id';
import getSelectedSiteSlug from 'calypso/state/ui/selectors/get-selected-site-slug';
import ImageEditorCrop from './image-editor-crop';
Expand Down Expand Up @@ -100,9 +99,9 @@ export class ImageEditorCanvas extends Component {
}

fetchImageBlob( src ) {
const { siteSlug, isPrivateAtomic } = this.props;
const { siteSlug, isJetpackNonAtomic } = this.props;
const { filePath, query, isRelativeToSiteRoot } = mediaURLToProxyConfig( src, siteSlug );
const useProxy = isPrivateAtomic && filePath && isRelativeToSiteRoot;
const useProxy = ! isJetpackNonAtomic && !! filePath && isRelativeToSiteRoot;

if ( useProxy ) {
return getAtomicSiteMediaViaProxyRetry( siteSlug, filePath, { query } );
Expand Down Expand Up @@ -293,8 +292,7 @@ export default connect(
( state ) => {
const siteId = getSelectedSiteId( state );
const siteSlug = getSelectedSiteSlug( state );
const isPrivateAtomic =
isPrivateSite( state, siteId ) && isSiteAutomatedTransfer( state, siteId );
const isJetpackNonAtomic = isJetpackSite( state, siteId, { treatAtomicAsJetpackSite: false } );

const transform = getImageEditorTransform( state );
const { src, mimeType } = getImageEditorFileInfo( state );
Expand All @@ -304,7 +302,7 @@ export default connect(

return {
siteSlug,
isPrivateAtomic,
isJetpackNonAtomic,
src,
mimeType,
transform,
Expand Down
9 changes: 4 additions & 5 deletions client/my-sites/media-library/media-file.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import * as React from 'react';
import { connect } from 'react-redux';
import { Dispatch } from 'redux';
import { mediaURLToProxyConfig } from 'calypso/lib/media/utils';
import isPrivateSite from 'calypso/state/selectors/is-private-site';
import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
import isJetpackSite from 'calypso/state/sites/selectors/is-jetpack-site';
import { IAppState } from 'calypso/state/types';
import getSelectedSiteId from 'calypso/state/ui/selectors/get-selected-site-id';
import getSelectedSiteSlug from 'calypso/state/ui/selectors/get-selected-site-slug';
Expand Down Expand Up @@ -55,10 +54,10 @@ const MediaFile: React.FC< MediaFileProps > = function MediaFile( {
export default connect( ( state: IAppState, { src }: Pick< MediaFileProps, 'src' > ) => {
const siteId = getSelectedSiteId( state );
const siteSlug = getSelectedSiteSlug( state ) as string;
const isAtomic = !! isSiteAutomatedTransfer( state, siteId as number );
const isPrivate = !! isPrivateSite( state, siteId ?? 0 );
const { filePath, query, isRelativeToSiteRoot } = mediaURLToProxyConfig( src, siteSlug );
const useProxy = Boolean( isAtomic && isPrivate && filePath && isRelativeToSiteRoot );
const isJetpackNonAtomic =
siteId && isJetpackSite( state, siteId, { treatAtomicAsJetpackSite: false } );
const useProxy = ! isJetpackNonAtomic && !! filePath && isRelativeToSiteRoot;

return {
query,
Expand Down
Loading