mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix clearBrowserHistory: url should not always be replaced by "/" as PairDrop might not always be hosted at domain root

Browse source
This commit is contained in:
schlagmichdoch 2023-05-30 01:21:17 +02:00
parent a3a8228327
commit d36cd3524c
6 changed files with 58 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/scripts/ui.js
View file

@ -1024,7 +1024,8 @@ class PairDeviceDialog extends Dialog {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
if (urlParams.has('room_key')) { if (urlParams.has('room_key')) {
this._pairDeviceJoin(urlParams.get('room_key')); this._pairDeviceJoin(urlParams.get('room_key'));
window.history.replaceState({}, "title**", '/'); //remove room_key from url const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url); //remove room_key from url
} }
} }
@ -1575,7 +1576,8 @@ class Base64ZipDialog extends Dialog {
} }
clearBrowserHistory() { clearBrowserHistory() {
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
hide() { hide() {
@ -1791,7 +1793,8 @@ class WebShareTargetUI {
} }
} }
} }
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
} }
} }
@ -1815,7 +1818,8 @@ class WebFileHandlersUI {
Events.fire('activate-paste-mode', {files: files, text: ""}) Events.fire('activate-paste-mode', {files: files, text: ""})
launchParams = null; launchParams = null;
}); });
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
} }
} }

4
public/scripts/util.js
View file

@ -402,3 +402,7 @@ const cyrb53 = function(str, seed = 0) {
function onlyUnique (value, index, array) { function onlyUnique (value, index, array) {
return array.indexOf(value) === index; return array.indexOf(value) === index;
} }
function getUrlWithoutArguments() {
return `${window.location.protocol}//${window.location.host}${window.location.pathname}`;
}

34
public/service-worker.js
View file

@ -72,8 +72,7 @@ self.addEventListener('fetch', function(event) {
if (event.request.method === "POST") { if (event.request.method === "POST") {
// Requests related to Web Share Target. // Requests related to Web Share Target.
event.respondWith((async () => { event.respondWith((async () => {
let share_url = await evaluateRequestData(event.request); const share_url = await evaluateRequestData(event.request);
share_url = event.request.url + share_url;
return Response.redirect(encodeURI(share_url), 302); return Response.redirect(encodeURI(share_url), 302);
})()); })());
} else { } else {
@ -101,15 +100,16 @@ self.addEventListener('activate', evt =>
) )
); );
const evaluateRequestData = async function (request) { const evaluateRequestData = function (request) {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("allfiles");
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("allfiles");
const pairDropUrl = request.url;
if (files && files.length > 0) { if (files && files.length > 0) {
let fileObjects = []; let fileObjects = [];
for (let i=0; i<files.length; i++) { for (let i=0; i<files.length; i++) {
@ -128,21 +128,21 @@ const evaluateRequestData = async function (request) {
const objectStoreRequest = objectStore.add(fileObjects[i]); const objectStoreRequest = objectStore.add(fileObjects[i]);
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
if (i === fileObjects.length - 1) resolve('?share-target=files'); if (i === fileObjects.length - 1) resolve(pairDropUrl + '?share-target=files');
} }
} }
} }
DBOpenRequest.onerror = _ => { DBOpenRequest.onerror = _ => {
resolve(''); resolve(pairDropUrl);
} }
} else { } else {
let share_url = '?share-target=text'; let urlArgument = '?share-target=text';
if (title) share_url += `&title=${title}`; if (title) urlArgument += `&title=${title}`;
if (text) share_url += `&text=${text}`; if (text) urlArgument += `&text=${text}`;
if (url) share_url += `&url=${url}`; if (url) urlArgument += `&url=${url}`;
resolve(share_url); resolve(pairDropUrl + urlArgument);
} }
}); });
} }

12
public_included_ws_fallback/scripts/ui.js
View file

@ -1025,7 +1025,8 @@ class PairDeviceDialog extends Dialog {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
if (urlParams.has('room_key')) { if (urlParams.has('room_key')) {
this._pairDeviceJoin(urlParams.get('room_key')); this._pairDeviceJoin(urlParams.get('room_key'));
window.history.replaceState({}, "title**", '/'); //remove room_key from url const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url); //remove room_key from url
} }
} }
@ -1576,7 +1577,8 @@ class Base64ZipDialog extends Dialog {
} }
clearBrowserHistory() { clearBrowserHistory() {
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
hide() { hide() {
@ -1792,7 +1794,8 @@ class WebShareTargetUI {
} }
} }
} }
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
} }
} }
@ -1816,7 +1819,8 @@ class WebFileHandlersUI {
Events.fire('activate-paste-mode', {files: files, text: ""}) Events.fire('activate-paste-mode', {files: files, text: ""})
launchParams = null; launchParams = null;
}); });
window.history.replaceState({}, "Rewrite URL", '/'); const url = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", url);
} }
} }
} }

4
public_included_ws_fallback/scripts/util.js
View file

@ -403,6 +403,10 @@ function onlyUnique (value, index, array) {
return array.indexOf(value) === index; return array.indexOf(value) === index;
} }
function getUrlWithoutArguments() {
return `${window.location.protocol}//${window.location.host}${window.location.pathname}`;
}
function arrayBufferToBase64(buffer) { function arrayBufferToBase64(buffer) {
var binary = ''; var binary = '';
var bytes = new Uint8Array(buffer); var bytes = new Uint8Array(buffer);

34
public_included_ws_fallback/service-worker.js
View file

@ -72,8 +72,7 @@ self.addEventListener('fetch', function(event) {
if (event.request.method === "POST") { if (event.request.method === "POST") {
// Requests related to Web Share Target. // Requests related to Web Share Target.
event.respondWith((async () => { event.respondWith((async () => {
let share_url = await evaluateRequestData(event.request); const share_url = await evaluateRequestData(event.request);
share_url = event.request.url + share_url;
return Response.redirect(encodeURI(share_url), 302); return Response.redirect(encodeURI(share_url), 302);
})()); })());
} else { } else {
@ -101,15 +100,16 @@ self.addEventListener('activate', evt =>
) )
); );
const evaluateRequestData = async function (request) { const evaluateRequestData = function (request) {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("allfiles");
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
const formData = await request.formData();
const title = formData.get("title");
const text = formData.get("text");
const url = formData.get("url");
const files = formData.getAll("allfiles");
const pairDropUrl = request.url;
if (files && files.length > 0) { if (files && files.length > 0) {
let fileObjects = []; let fileObjects = [];
for (let i=0; i<files.length; i++) { for (let i=0; i<files.length; i++) {
@ -128,21 +128,21 @@ const evaluateRequestData = async function (request) {
const objectStoreRequest = objectStore.add(fileObjects[i]); const objectStoreRequest = objectStore.add(fileObjects[i]);
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
if (i === fileObjects.length - 1) resolve('?share-target=files'); if (i === fileObjects.length - 1) resolve(pairDropUrl + '?share-target=files');
} }
} }
} }
DBOpenRequest.onerror = _ => { DBOpenRequest.onerror = _ => {
resolve(''); resolve(pairDropUrl);
} }
} else { } else {
let share_url = '?share-target=text'; let urlArgument = '?share-target=text';
if (title) share_url += `&title=${title}`; if (title) urlArgument += `&title=${title}`;
if (text) share_url += `&text=${text}`; if (text) urlArgument += `&text=${text}`;
if (url) share_url += `&url=${url}`; if (url) urlArgument += `&url=${url}`;
resolve(share_url); resolve(pairDropUrl + urlArgument);
} }
}); });
} }