remove inline scripts as forbiden by header

Andrewiski · Jan 19, 2023 · a38f24e · a38f24e
1 parent 8c3d344
commit a38f24e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/dockerCompose/uisp/docker-compose-append.yml b/dockerCompose/uisp/docker-compose-append.yml
@@ -1,5 +1,5 @@
   uisptools:
-    image: "andrewiski/uisptools:0.0.11"
+    image: "andrewiski/uisptools:0.0.12"
     user: "1001"
     ports:
       - "49443:49443"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uisp-tools",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Tools for UISP",
   "main": "server.js",
   "license": "GPL-3.0-or-later",

diff --git a/public/index.htm b/public/index.htm
@@ -3,6 +3,7 @@
 <html class="h-100">
 <head>
     <meta charset="utf-8" />
+    <link rel="shortcut icon" href="/uisptools/favicon.ico" type="image/x-icon">  
     <title>UISP Tools</title>
 
 
@@ -26,22 +27,19 @@
 
     <script src="/uisptools/scripts/app/uispTools.js?v=1"></script>
     <script src="/uisptools/javascript/googlemaps/index.min.js"></script>
+
+    <!-- 
+    <script src="//maps.googleapis.com/maps/api/js?callback=_dk_google_maps_loader_cb&amp;key=AIzaSyD7m_D4BWDOdPH9ja_X5aMSGpdyF015-2k&amp;libraries=places&amp;v=3.47" async=""></script>
+    <script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/51/6/common.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/51/6/util.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/51/6/map.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/51/6/onion.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="https://maps.googleapis.com/maps-api-v3/api/js/51/6/controls.js"></script>
+    -->
     <script src="/uisptools/javascript/polyfill.io/polyfill.min.js?features=default"></script>
     <!-- <script src="/scripts/app/widgets/uisptools/testing/testapicalls.js?v=1"></script> -->
 
-    <script>
-        $(function () {
-            $.uisptools.appInit().then(
-                function () {
-
-                },
-                function (err) {
-                    console.log('error', err)
-                }
-
-            )
-        })
-    </script>
+
 </head>
 <body class="d-flex flex-column h-100">
     <header>     

diff --git a/public/scripts/app/uispTools.js b/public/scripts/app/uispTools.js
@@ -2113,3 +2113,15 @@
         //End Common Error Handler
     });
 })(jQuery);
+
+$(function () {
+    $.uisptools.appInit().then(
+        function () {
+
+        },
+        function (err) {
+            console.log('error', err)
+        }
+
+    )
+})
diff --git a/server.js b/server.js
@@ -428,6 +428,7 @@ app.use('/uisptools/javascript/polyfill.io/polyfill.min.js',function(req, res){
         unknown:'polyfill',
         stream:false
     }).then(function(bundleString) {
+        res.contentType("text/javascript");
         res.send(bundleString);
     });
 })
@@ -440,6 +441,7 @@ app.use('/uisptools/javascript/polyfill.io/polyfill.js',function(req, res){
         unknown:'polyfill',
         stream:false
     }).then(function(bundleString) {
+        res.contentType("text/javascript");
         res.send(bundleString);
     });
 })