marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 16:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with TS types update and signerKey extraction

Browse Source
This commit is contained in:
Alexander Cerutti
2020-09-05 22:32:33 +02:00
parent ba772da3bc
commit a441297aa2
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/parser.ts
View File

@@ -231,24 +231,26 @@ export function getModelBufferContents(model: BundleUnit): PartitionedBundle {
* @param options * @param options
*/ */
type flatCertificates = Omit<Certificates, "signerKey"> & { signerKey: string; [key: string]: string }; type flatCertificates = Omit<Certificates, "signerKey"> & {
signerKey: string;
};
export async function readCertificatesFromOptions(options: Certificates): Promise<FinalCertificates> { export async function readCertificatesFromOptions(options: Certificates): Promise<FinalCertificates> {
if (!(options && Object.keys(options).length && isValid(options, "certificatesSchema"))) { if (!(options && Object.keys(options).length && isValid(options, "certificatesSchema"))) {
throw new Error(formatMessage("CP_NO_CERTS")); throw new Error(formatMessage("CP_NO_CERTS"));
} }
let signerKey: string;
if (typeof options.signerKey === "object") {
signerKey = options.signerKey?.keyFile;
} else {
signerKey = options.signerKey;
}
// if the signerKey is an object, we want to get // if the signerKey is an object, we want to get
// all the real contents and don't care of passphrase // all the real contents and don't care of passphrase
const flattenedDocs = Object.assign({}, options, { const flattenedDocs = Object.assign({}, options, { signerKey }) as flatCertificates;
signerKey: (
options.signerKey && typeof options.signerKey === "string" &&
options.signerKey || (
options.signerKey &&
options.signerKey.keyFile
)
)
}) as flatCertificates;
// We read the contents // We read the contents
const rawContentsPromises = Object.keys(flattenedDocs) const rawContentsPromises = Object.keys(flattenedDocs)