From 8db4f3c8e1ad129cab4c636bf7a771d3ddec6a56 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Sat, 18 Sep 2021 21:14:07 -0700
Subject: [PATCH] Update bs5.onvifScanner.js

---
 web/assets/js/bs5.onvifScanner.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/assets/js/bs5.onvifScanner.js b/web/assets/js/bs5.onvifScanner.js
index 81dfcf66..a2e0adc2 100644
--- a/web/assets/js/bs5.onvifScanner.js
+++ b/web/assets/js/bs5.onvifScanner.js
@@ -10,7 +10,14 @@ $(document).ready(function(e){
     var scanForm = onvifScannerWindow.find('form');
     var outputBlock = onvifScannerWindow.find('.onvif_result');
     var sideMenuList = $(`#side-menu-link-onvifScanner  ul`)
-    var checkTimeout
+    var checkTimeout;
+    function addCredentialsToUri(uri,username,password){
+        let newUri = `${uri}`
+        const uriParts = newUri.split('://')
+        uriParts[1] = `${username}:${password}@${uriParts[1]}`
+        newUri = uriParts.join('://')
+        return newUri
+    }
     function drawFoundCamerasSubMenu(){
         var allFound = []
         Object.keys(loadedResults).forEach(function(tempID){
@@ -67,7 +74,7 @@ $(document).ready(function(e){
                 path: pathLocation.pathname,
                 protocol: theLocation.protocol,
                 details: {
-                    auto_host: streamUrl,
+                    auto_host: addCredentialsToUri(streamUrl,currentUsername,currentPassword),
                     muser: currentUsername,
                     mpass: currentPassword,
                     is_onvif: '1',