mirror of
https://github.com/woocommerce/woocommerce-paypal-payments.git
synced 2025-09-06 18:16:38 +08:00
✨ Add data sanitation to the Redux store
This commit is contained in:
parent
00519d9e25
commit
5e9866cde9
2 changed files with 87 additions and 16 deletions
|
@ -83,52 +83,86 @@ export const useLocationProps = ( location ) => {
|
||||||
const { getLocationProp, setLocationProp } = useHooks();
|
const { getLocationProp, setLocationProp } = useHooks();
|
||||||
const details = STYLING_LOCATIONS[ location ] ?? {};
|
const details = STYLING_LOCATIONS[ location ] ?? {};
|
||||||
|
|
||||||
|
const sanitize = ( value ) => ( undefined === value ? true : !! value );
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_LOCATIONS ),
|
choices: Object.values( STYLING_LOCATIONS ),
|
||||||
details,
|
details,
|
||||||
isActive: getLocationProp( location, 'enabled' ),
|
isActive: sanitize( getLocationProp( location, 'enabled' ) ),
|
||||||
setActive: ( state ) => setLocationProp( location, 'enabled', state ),
|
setActive: ( state ) =>
|
||||||
|
setLocationProp( location, 'enabled', sanitize( state ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const usePaymentMethodProps = ( location ) => {
|
export const usePaymentMethodProps = ( location ) => {
|
||||||
const { getLocationProp, setLocationProp } = useHooks();
|
const { getLocationProp, setLocationProp } = useHooks();
|
||||||
|
|
||||||
|
const sanitize = ( value ) => {
|
||||||
|
if ( Array.isArray( value ) ) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
return value ? [ value ] : [];
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_PAYMENT_METHODS ),
|
choices: Object.values( STYLING_PAYMENT_METHODS ),
|
||||||
paymentMethods: getLocationProp( location, 'methods' ),
|
paymentMethods: sanitize( getLocationProp( location, 'methods' ) ),
|
||||||
setPaymentMethods: ( methods ) =>
|
setPaymentMethods: ( methods ) =>
|
||||||
setLocationProp( location, 'methods', methods ),
|
setLocationProp( location, 'methods', sanitize( methods ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useColorProps = ( location ) => {
|
export const useColorProps = ( location ) => {
|
||||||
const { getLocationProp, setLocationProp } = useHooks();
|
const { getLocationProp, setLocationProp } = useHooks();
|
||||||
|
|
||||||
|
const sanitize = ( value ) => {
|
||||||
|
const isValidColor = Object.values( STYLING_COLORS ).some(
|
||||||
|
( color ) => color.value === value
|
||||||
|
);
|
||||||
|
return isValidColor ? value : STYLING_COLORS.gold.value;
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_COLORS ),
|
choices: Object.values( STYLING_COLORS ),
|
||||||
color: getLocationProp( location, 'color' ),
|
color: sanitize( getLocationProp( location, 'color' ) ),
|
||||||
setColor: ( color ) => setLocationProp( location, 'color', color ),
|
setColor: ( color ) =>
|
||||||
|
setLocationProp( location, 'color', sanitize( color ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useShapeProps = ( location ) => {
|
export const useShapeProps = ( location ) => {
|
||||||
const { getLocationProp, setLocationProp } = useHooks();
|
const { getLocationProp, setLocationProp } = useHooks();
|
||||||
|
|
||||||
|
const sanitize = ( value ) => {
|
||||||
|
const isValidColor = Object.values( STYLING_SHAPES ).some(
|
||||||
|
( color ) => color.value === value
|
||||||
|
);
|
||||||
|
return isValidColor ? value : STYLING_SHAPES.rect.value;
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_SHAPES ),
|
choices: Object.values( STYLING_SHAPES ),
|
||||||
shape: getLocationProp( location, 'shape' ),
|
shape: sanitize( getLocationProp( location, 'shape' ) ),
|
||||||
setShape: ( shape ) => setLocationProp( location, 'shape', shape ),
|
setShape: ( shape ) =>
|
||||||
|
setLocationProp( location, 'shape', sanitize( shape ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useLabelProps = ( location ) => {
|
export const useLabelProps = ( location ) => {
|
||||||
const { getLocationProp, setLocationProp } = useHooks();
|
const { getLocationProp, setLocationProp } = useHooks();
|
||||||
|
|
||||||
|
const sanitize = ( value ) => {
|
||||||
|
const isValidColor = Object.values( STYLING_LABELS ).some(
|
||||||
|
( color ) => color.value === value
|
||||||
|
);
|
||||||
|
return isValidColor ? value : STYLING_LABELS.paypal.value;
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_LABELS ),
|
choices: Object.values( STYLING_LABELS ),
|
||||||
label: getLocationProp( location, 'label' ),
|
label: sanitize( getLocationProp( location, 'label' ) ),
|
||||||
setLabel: ( label ) => setLocationProp( location, 'label', label ),
|
setLabel: ( label ) =>
|
||||||
|
setLocationProp( location, 'label', sanitize( label ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -137,11 +171,19 @@ export const useLayoutProps = ( location ) => {
|
||||||
const { details } = useLocationProps( location );
|
const { details } = useLocationProps( location );
|
||||||
const isAvailable = false !== details.props.layout;
|
const isAvailable = false !== details.props.layout;
|
||||||
|
|
||||||
|
const sanitize = ( value ) => {
|
||||||
|
const isValidColor = Object.values( STYLING_LAYOUTS ).some(
|
||||||
|
( color ) => color.value === value
|
||||||
|
);
|
||||||
|
return isValidColor ? value : STYLING_LAYOUTS.vertical.value;
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
choices: Object.values( STYLING_LAYOUTS ),
|
choices: Object.values( STYLING_LAYOUTS ),
|
||||||
isAvailable,
|
isAvailable,
|
||||||
layout: getLocationProp( location, 'layout' ),
|
layout: sanitize( getLocationProp( location, 'layout' ) ),
|
||||||
setLayout: ( layout ) => setLocationProp( location, 'layout', layout ),
|
setLayout: ( layout ) =>
|
||||||
|
setLocationProp( location, 'layout', sanitize( layout ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -155,10 +197,14 @@ export const useTaglineProps = ( location ) => {
|
||||||
STYLING_LAYOUTS.horizontal.value ===
|
STYLING_LAYOUTS.horizontal.value ===
|
||||||
getLocationProp( location, 'layout' );
|
getLocationProp( location, 'layout' );
|
||||||
|
|
||||||
|
const sanitize = ( value ) => !! value;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isAvailable,
|
isAvailable,
|
||||||
tagline: isAvailable ? getLocationProp( location, 'tagline' ) : false,
|
tagline: isAvailable
|
||||||
|
? sanitize( getLocationProp( location, 'tagline' ) )
|
||||||
|
: false,
|
||||||
setTagline: ( tagline ) =>
|
setTagline: ( tagline ) =>
|
||||||
setLocationProp( location, 'tagline', tagline ),
|
setLocationProp( location, 'tagline', sanitize( tagline ) ),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -70,6 +70,19 @@ const defaultPersistent = Object.freeze( {
|
||||||
} ),
|
} ),
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
const sanitizeLocation = ( oldDetails, newDetails ) => {
|
||||||
|
// Skip if provided details are not a plain object.
|
||||||
|
if (
|
||||||
|
! newDetails ||
|
||||||
|
'object' !== typeof newDetails ||
|
||||||
|
Array.isArray( newDetails )
|
||||||
|
) {
|
||||||
|
return oldDetails;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { ...oldDetails, ...newDetails };
|
||||||
|
};
|
||||||
|
|
||||||
// Reducer logic.
|
// Reducer logic.
|
||||||
|
|
||||||
const [ setTransient, setPersistent ] = createSetters(
|
const [ setTransient, setPersistent ] = createSetters(
|
||||||
|
@ -96,8 +109,20 @@ const reducer = createReducer( defaultTransient, defaultPersistent, {
|
||||||
return cleanState;
|
return cleanState;
|
||||||
},
|
},
|
||||||
|
|
||||||
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) =>
|
[ ACTION_TYPES.HYDRATE ]: ( state, payload ) => {
|
||||||
setPersistent( state, payload.data ),
|
const validData = Object.keys( defaultPersistent ).reduce(
|
||||||
|
( data, location ) => {
|
||||||
|
data[ location ] = sanitizeLocation(
|
||||||
|
state.data[ location ],
|
||||||
|
payload.data[ location ]
|
||||||
|
);
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
{}
|
||||||
|
);
|
||||||
|
|
||||||
|
return setPersistent( state, validData );
|
||||||
|
},
|
||||||
} );
|
} );
|
||||||
|
|
||||||
export default reducer;
|
export default reducer;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue