forked from AkkomaGang/akkoma-fe
Merge branch 'fix/unicode-passwords' into 'develop'
Fix basicauth base64 encoding for unicode passwords. See merge request pleroma/pleroma-fe!180
This commit is contained in:
commit
bf7b5a7105
1 changed files with 11 additions and 1 deletions
|
@ -43,6 +43,16 @@ let fetch = (url, options) => {
|
||||||
return oldfetch(fullUrl, options)
|
return oldfetch(fullUrl, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// from https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
|
||||||
|
let utoa = (str) => {
|
||||||
|
// first we use encodeURIComponent to get percent-encoded UTF-8,
|
||||||
|
// then we convert the percent encodings into raw bytes which
|
||||||
|
// can be fed into btoa.
|
||||||
|
return btoa(encodeURIComponent(str)
|
||||||
|
.replace(/%([0-9A-F]{2})/g,
|
||||||
|
(match, p1) => { return String.fromCharCode('0x' + p1) }))
|
||||||
|
}
|
||||||
|
|
||||||
// Params
|
// Params
|
||||||
// cropH
|
// cropH
|
||||||
// cropW
|
// cropW
|
||||||
|
@ -156,7 +166,7 @@ const register = (params) => {
|
||||||
|
|
||||||
const authHeaders = (user) => {
|
const authHeaders = (user) => {
|
||||||
if (user && user.username && user.password) {
|
if (user && user.username && user.password) {
|
||||||
return { 'Authorization': `Basic ${btoa(`${user.username}:${user.password}`)}` }
|
return { 'Authorization': `Basic ${utoa(`${user.username}:${user.password}`)}` }
|
||||||
} else {
|
} else {
|
||||||
return { }
|
return { }
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue