pinokiod 3.263.0 → 3.265.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.263.0",
+  "version": "3.265.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -4882,8 +4882,10 @@ class Server {
       }
       //res.render(`connect/${req.params.provider}`, {
       const config = this.kernel.connect.config[req.params.provider]
+      const isPinokioHost = req.hostname === 'pinokio.localhost'
+      const renderProtocol = isPinokioHost ? 'https' : 'http'
       res.render(`connect/index`, {
-        protocol: req.$source.protocol,
+        protocol: renderProtocol,
         name: req.params.provider,
         config,
         portal: this.portal,

package/server/views/connect/index.ejs

@@ -258,7 +258,7 @@
 
     <script>
         const CONNECT_NAME = "<%=name%>"
-        const isSecureConnectContext = window.location.protocol === 'https:' && window.location.hostname === 'pinokio.localhost'
+        const isSecureConnectContext = <%= protocol === "https" ? 'true' : 'false' %>
         const statusElement = document.getElementById('status')
         const loaderElement = document.getElementById('connect-loader')
         const loaderMessageElement = document.getElementById('loader-message')
@@ -417,15 +417,10 @@
                 setStatus('Failed to logout: ' + err.message, 'error')
             } finally {
                 hideLoader()
-                if (loginSection) {
-                    loginSection.classList.remove('hidden')
-                }
-                if (httpSection) {
-                    httpSection.classList.remove('hidden')
-                }
                 if (userSection) {
                     userSection.classList.add('hidden')
                 }
+                configureInitialView()
             }
         }
 
@@ -680,8 +675,7 @@
             setStatus('Waiting for connection...', 'warning')
             const secureWindow = window.open(SECURE_CONNECT_URL, '_blank')
             if (!secureWindow) {
-                window.location.href = SECURE_CONNECT_URL
-                return
+                setStatus('Could not open the secure window. Please allow pop-ups or open https://pinokio.localhost/connect/<%=name%> manually.', 'error')
             }
             pollConnectStatus()
             connectPollTimer = setInterval(pollConnectStatus, CONNECT_POLL_INTERVAL)