Changed logic for formatVersion parsing and defaulting

This commit is contained in:
Alexander Cerutti
2021-10-20 00:08:38 +02:00
parent 757630834d
commit 1735a3824a

View File

@@ -28,6 +28,7 @@ export interface FileBuffers {
}
export interface PassProps {
formatVersion?: 1;
serialNumber?: string;
description?: string;
organizationName?: string;
@@ -119,6 +120,7 @@ export const PassType = Joi.string().regex(
);
export const OverridablePassProps = Joi.object<OverridablePassProps>({
formatVersion: Joi.number().default(1),
semantics: Semantics,
voided: Joi.boolean(),
logoText: Joi.string(),
@@ -145,12 +147,8 @@ export const OverridablePassProps = Joi.object<OverridablePassProps>({
}).with("webServiceURL", "authenticationToken");
export const PassProps = Joi.object<
OverridablePassProps &
PassKindsProps &
PassPropsFromMethods & { formatVersion: 1 }
>({
formatVersion: Joi.number(),
})
OverridablePassProps & PassKindsProps & PassPropsFromMethods
>()
.concat(OverridablePassProps)
.concat(PassKindsProps)
.concat(PassPropsFromMethods);