From ed8dc195fb084d8406a292079a55fcca3efc4798 Mon Sep 17 00:00:00 2001
From: Embrace <silviolleite@gmail.com>
Date: Thu, 7 Mar 2019 07:52:15 -0300
Subject: [PATCH] Updated manifest.json and serviceworker by adding scope
 parameter.

---
 CHANGELOG.md                | 6 ++++++
 README.md                   | 1 +
 pwa/app_settings.py         | 1 +
 pwa/templates/manifest.json | 1 +
 pwa/templates/pwa.html      | 2 +-
 setup.py                    | 2 +-
 tests/test_settings_attr.py | 1 +
 tests/test_view.py          | 1 +
 8 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c7a245..a67b6d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,4 +52,10 @@
   
   ### Fixed
   - Fix problem of multiple service workers being registered over multiple URLs
+  
+ ## 1.0.5
+  
+  ### Added
+  - Updated manifest.json by adding scope parameter.
+  - Updated serviceworker.js add scope dynamic parameter
  
\ No newline at end of file
diff --git a/README.md b/README.md
index c5ffed3..c896004 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ PWA_APP_DESCRIPTION = "My app description"
 PWA_APP_THEME_COLOR = '#0A0302'
 PWA_APP_BACKGROUND_COLOR = '#ffffff'
 PWA_APP_DISPLAY = 'standalone'
+PWA_APP_SCOPE = '/',
 PWA_APP_ORIENTATION = 'any'
 PWA_APP_START_URL = '/'
 PWA_APP_ICONS = [
diff --git a/pwa/app_settings.py b/pwa/app_settings.py
index 53b85e6..3ecd5f9 100644
--- a/pwa/app_settings.py
+++ b/pwa/app_settings.py
@@ -13,6 +13,7 @@ PWA_APP_ROOT_URL = getattr(settings, 'PWA_APP_ROOT_URL', '/')
 PWA_APP_THEME_COLOR = getattr(settings, 'PWA_APP_THEME_COLOR', '#000')
 PWA_APP_BACKGROUND_COLOR = getattr(settings, 'PWA_APP_BACKGROUND_COLOR', '#fff')
 PWA_APP_DISPLAY = getattr(settings, 'PWA_APP_DISPLAY', 'standalone')
+PWA_APP_SCOPE = getattr(settings, 'PWA_APP_SCOPE', '/')
 PWA_APP_ORIENTATION = getattr(settings, 'PWA_APP_ORIENTATION', 'any')
 PWA_APP_START_URL = getattr(settings, 'PWA_APP_START_URL', '/')
 PWA_APP_FETCH_URL = getattr(settings, 'PWA_APP_FETCH_URL', '/')
diff --git a/pwa/templates/manifest.json b/pwa/templates/manifest.json
index 627d797..b555ed2 100644
--- a/pwa/templates/manifest.json
+++ b/pwa/templates/manifest.json
@@ -5,6 +5,7 @@
   "description": {{ PWA_APP_DESCRIPTION|js }},
   "start_url": {{ PWA_APP_START_URL|js }},
   "display": {{ PWA_APP_DISPLAY|js }},
+  "scope": {{ PWA_APP_SCOPE|js }},
   "orientation": {{ PWA_APP_ORIENTATION|js }},
   "background_color": {{ PWA_APP_BACKGROUND_COLOR|js }},
   "theme_color": {{ PWA_APP_THEME_COLOR|js }},
diff --git a/pwa/templates/pwa.html b/pwa/templates/pwa.html
index 660763c..00c897f 100644
--- a/pwa/templates/pwa.html
+++ b/pwa/templates/pwa.html
@@ -36,7 +36,7 @@
     // Initialize the service worker
     if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register('/serviceworker.js', {
-            scope: '/'
+            scope: '{{ PWA_APP_SCOPE }}'
         }).then(function (registration) {
             // Registration was successful
             console.log('django-pwa: ServiceWorker registration successful with scope: ', registration.scope);
diff --git a/setup.py b/setup.py
index ff16a81..06dccfb 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ install_requirements = [
 
 setup(
     name='django-pwa',
-    version='1.0.4',
+    version='1.0.5',
     packages=find_packages(),
     install_requires=install_requirements,
     include_package_data=True,
diff --git a/tests/test_settings_attr.py b/tests/test_settings_attr.py
index 85b3635..cef2bb2 100644
--- a/tests/test_settings_attr.py
+++ b/tests/test_settings_attr.py
@@ -12,6 +12,7 @@ class AppSettingsTest(TestCase):
             'PWA_APP_ROOT_URL',
             'PWA_APP_THEME_COLOR',
             'PWA_APP_BACKGROUND_COLOR',
+            'PWA_APP_SCOPE',
             'PWA_APP_DISPLAY',
             'PWA_APP_ORIENTATION',
             'PWA_APP_START_URL',
diff --git a/tests/test_view.py b/tests/test_view.py
index a5c6749..09cee8c 100644
--- a/tests/test_view.py
+++ b/tests/test_view.py
@@ -31,6 +31,7 @@ class ManifestTest(TestCase):
             '"description":',
             '"start_url":',
             '"display":',
+            '"scope":',
             '"background_color":',
             '"theme_color":',
             '"orientation":',