Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #967 btoa() issue

Browse source
This commit is contained in:
the-djmaze 2023-02-15 17:29:47 +01:00
parent 03379a6163
commit 4852895488
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/Common/Utils.js
View file

@ -17,12 +17,15 @@ export const
item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled), item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled),
// unescape(encodeURIComponent()) makes the UTF-16 DOMString to an UTF-8 string // unescape(encodeURIComponent()) makes the UTF-16 DOMString to an UTF-8 string
b64EncodeJSON = data => btoa(unescape(encodeURIComponent(JSON.stringify(data)))), b64Encode = data => btoa(unescape(encodeURIComponent(data))),
/* // Without deprecated 'unescape': /* // Without deprecated 'unescape':
b64EncodeJSON = data => btoa(encodeURIComponent(JSON.stringify(data)).replace( b64Encode = data => btoa(encodeURIComponent(data).replace(
/%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode('0x' + p1) /%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode('0x' + p1)
)), )),
*/ */
b64EncodeJSON = data => b64Encode(JSON.stringify(data)),
b64EncodeJSONSafe = data => b64EncodeJSON(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''), b64EncodeJSONSafe = data => b64EncodeJSON(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v); getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v);

2
dev/Mime/Parser.js
View file

@ -1,3 +1,4 @@
//import { b64Encode } from 'Common/Utils';
const const
// RFC2045 // RFC2045
@ -68,6 +69,7 @@ export function ParseMime(text)
body = QPDecode(body); body = QPDecode(body);
} }
body = btoa(body); body = btoa(body);
// body = b64Encode(body);
} }
return 'data:' + this.headerValue('content-type') + ';base64,' + body; return 'data:' + this.headerValue('content-type') + ';base64,' + body;
} }

4
dev/View/Popup/Compose.js
View file

@ -11,7 +11,7 @@ import {
FolderType FolderType
} from 'Common/EnumsUser'; } from 'Common/EnumsUser';
import { pInt, isArray, arrayLength } from 'Common/Utils'; import { pInt, isArray, arrayLength, b64Encode } from 'Common/Utils';
import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html'; import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html';
import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko'; import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
@ -57,7 +57,7 @@ const
tpl = createElement('template'), tpl = createElement('template'),
base64_encode = text => btoa(unescape(encodeURIComponent(text))).match(/.{1,76}/g).join('\r\n'), base64_encode = text => b64Encode(text).match(/.{1,76}/g).join('\r\n'),
getEmail = value => addressparser(value)[0]?.email || false, getEmail = value => addressparser(value)[0]?.email || false,

4
plugins/avatars/avatars.js
View file

@ -63,11 +63,11 @@
.slice(0,2) .slice(0,2)
.toUpperCase(), .toUpperCase(),
setIdenticon = (from, fn) => hash(from.email).then(hash => setIdenticon = (from, fn) => hash(from.email).then(hash =>
fn('data:image/svg+xml;base64,' + btoa(window.identiconSvg( fn('data:image/svg+xml;base64,' + btoa(unescape(encodeURIComponent(window.identiconSvg(
hash, hash,
fromChars(from), fromChars(from),
window.getComputedStyle(getEl('rl-app'), null).getPropertyValue('font-family') window.getComputedStyle(getEl('rl-app'), null).getPropertyValue('font-family')
))) )))))
), ),
addQueue = (msg, fn) => { addQueue = (msg, fn) => {
msg.from?.[0] && setIdenticon(msg.from[0], fn); msg.from?.[0] && setIdenticon(msg.from[0], fn);