Skip to content
Snippets Groups Projects
Commit 0dc858fb authored by Igor Markin's avatar Igor Markin
Browse files

Merge branch 'decoding-email-data' into 'master'

Add options for arrays and objects to decoding of MessageData

See merge request light/clients/utils!43
parents 2ccd4db5 560b1b8d
No related branches found
No related tags found
1 merge request!43Add options for arrays and objects to decoding of MessageData
export = $root;
declare var $root: {};
declare var $root: any;
export = $root;
declare var $root: {};
declare var $root: any;
......@@ -37,6 +37,8 @@ const decodeEmailData = (binary) => {
const emailDataMessage = EmailDataMessageV1.decode(common_1.ensureUint8Array(wrappedData.data));
const messageData = EmailDataMessageV1.toObject(emailDataMessage, {
bytes: String,
arrays: true,
objects: true,
});
return messageData;
}
......
......@@ -13,7 +13,7 @@ declare const _default: {
arrayBufferToHex: (buffer: ArrayBuffer) => string;
arrayBufferToBase64: (buffer: ArrayBuffer) => string;
base64ToArrayBuffer: (base64: string) => ArrayBuffer;
ensureUint8Array: (data: string | ArrayBuffer | Uint8Array) => Uint8Array;
ensureUint8Array: (data: string | Uint8Array | ArrayBuffer) => Uint8Array;
ensureArrayBuffer: (data: string | ArrayBuffer) => ArrayBuffer;
ensureBase64: (data: string | ArrayBuffer) => string;
escapeHtmlString: (string: string) => string;
......
......@@ -61,6 +61,8 @@ const decodeEmailData = (
const messageData = EmailDataMessageV1.toObject(emailDataMessage, {
bytes: String,
arrays: true, // populates empty arrays (repeated fields) even if defaults=false
objects: true, // populates empty objects (map fields) even if defaults=false
}) as MessageData;
return messageData;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment