mirror/web
1
0
Fork 0
mirror of https://github.com/meshtastic/web.git synced 2026-01-26 08:19:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from pdxlocations/url-validation

Browse Source 
Fix URL Validation
This commit is contained in:
Ben Meadors
2023-11-02 09:20:46 -05:00
committed by GitHub
parent a8c45ccb32 437db3cb7f
commit 68b207b67f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "meshtastic-web",
"version": "2.2.12-0",
"version": "2.2.12-1",
"type": "module",
"description": "Meshtastic web client",
"license": "GPL-3.0-only",

9
src/components/Dialog/ImportDialog.tsx
View File

@@ -34,11 +34,12 @@ export const ImportDialog = ({
useEffect(() => {
const base64String = QRCodeURL.split("e/#")[1]
?.replace(/-/g, "+")
.replace(/_/g, "/")
.padEnd(QRCodeURL.length + ((4 - (QRCodeURL.length % 4)) % 4), "=");
const paddedString = base64String
?.padEnd(base64String.length + ((4 - (base64String.length % 4)) % 4), "=")
.replace(/-/g, "+")
.replace(/_/g, "/");
try {
setChannelSet(Protobuf.ChannelSet.fromBinary(toByteArray(base64String)));
setChannelSet(Protobuf.ChannelSet.fromBinary(toByteArray(paddedString)));
setValidURL(true);
} catch (error) {
setValidURL(false);