From d067c4e7317126fd01008f5263a511a1efcd4c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Thu, 22 Oct 2020 15:35:40 +0200
Subject: [PATCH] fix(pwa) move manifest to the root

It must be served from the same origin, so we need to bypass the CDN we use for
meet.jit.si. See the code comments for the rationale on the workaround.
---
 debian/jitsi-meet-web.install             | 3 ++-
 index.html                                | 7 ++++++-
 static/pwa/manifest.json => manifest.json | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename static/pwa/manifest.json => manifest.json (81%)

diff --git a/debian/jitsi-meet-web.install b/debian/jitsi-meet-web.install
index e755d9b544..91df2dd033 100644
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@@ -13,4 +13,5 @@ lang					/usr/share/jitsi-meet/
 connection_optimization	/usr/share/jitsi-meet/
 resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
-pwa-worker.js /usr/share/jitsi-meet/
+pwa-worker.js			/usr/share/jitsi-meet/
+manifest.json			/usr/share/jitsi-meet/
diff --git a/index.html b/index.html
index 0f4f579133..60a6e9c06a 100644
--- a/index.html
+++ b/index.html
@@ -9,8 +9,13 @@
 
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <link rel="stylesheet" href="css/all.css">
-    <link rel="manifest" href="static/pwa/manifest.json">
+    <link rel="manifest" id="manifest-placeholder">
+
     <script>
+        // Dynamically generate the manifest location URL. It must be served from the document origin, and we may have
+        // the base pointing to the CDN. This way we can generate a full URL which will bypass the base.
+        document.querySelector('#manifest-placeholder').setAttribute('href', window.location.origin + '/manifest.json');
+
         document.addEventListener('DOMContentLoaded', () => {
             if (!JitsiMeetJS.app) {
                 return;
diff --git a/static/pwa/manifest.json b/manifest.json
similarity index 81%
rename from static/pwa/manifest.json
rename to manifest.json
index a45fea1b02..da2cecff30 100644
--- a/static/pwa/manifest.json
+++ b/manifest.json
@@ -11,17 +11,17 @@
   "name": "Jitsi Meet",
   "icons": [
     {
-      "src": "icons/icon192.png",
+      "src": "static/pwa/icons/icon192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "icons/icon512.png",
+      "src": "static/pwa/icons/icon512.png",
       "type": "image/png",
       "sizes": "512x512"
     },
     {
-      "src": "icons/iconMask.png",
+      "src": "static/pwa/icons/iconMask.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"