Fixed errors with digest and Connect settings when restoring from con…

…figuration file
prusa3d · Dec 9, 2022 · 7112f5d · 7112f5d
1 parent dffa36d
commit 7112f5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/prusa/link/templates/wizard_credentials.html b/prusa/link/templates/wizard_credentials.html
@@ -26,7 +26,7 @@ <h1>Setup Credentials</h1>
               </div>
             </div>
 
-            {% if wizard.restored_settings %}
+            {% if wizard.restored_digest %}
               <div>Your password is restored from your configuration file. If you want to set a new one, please fill it into the form below.</div><br/>
               {% set password_placeholder = "Restored from configuration file" %}
             {% endif %}

diff --git a/prusa/link/templates/wizard_finish.html b/prusa/link/templates/wizard_finish.html
@@ -67,13 +67,12 @@ <h3>Printer</h3>
     <div class="row">
         <div class="col">
             <h1>Prusa Connect</h1>
+            {% if wizard.restored_connect %}
+                <div>Your Prusa Connect settings was restored from configuration file</div>
+            {% else %}
             <div>Prusa Connect is a web service, where you have a complete overview of all your 3D printers at all times.</br>
                 You can link your PrusaLink with Prusa Connect <b>now</b>, using button down below.</div>
-            <ul>
-                {% if printer.token %}
-                <li>Token: <span class="white">{{ printer.token }}</span></li>
-                {% endif %}
-            </ul>
+            {% endif %}
         </div>
     </div>
     <!-- Connect Row End -->

diff --git a/prusa/link/web/lib/wizard.py b/prusa/link/web/lib/wizard.py
@@ -86,7 +86,7 @@ def __init__(self, _app):
         # auth
         self.username = _app.settings.service_local.username
         self.digest = None
-        self.restored_settings = False
+        self.restored_digest = False
 
         # network
         self.net_hostname = _app.settings.network.hostname
@@ -98,6 +98,7 @@ def __init__(self, _app):
 
         # connect
         self.connect_skip = False
+        self.restored_connect = False
         self.connect_hostname = _app.settings.service_connect.hostname
         self.connect_tls = _app.settings.service_connect.tls
         self.connect_port = _app.settings.service_connect.port

diff --git a/prusa/link/web/wizard.py b/prusa/link/web/wizard.py
@@ -127,20 +127,25 @@ def process_connect(config):
         if option == 'port':
             app.wizard.connect_port = int(connect['port'])
         if option == 'token':
-            app.wizard.connect_token = connect['token'] \
-                if connect['token'] else ''
+            if connect['token']:
+                app.wizard.connect_token = connect['token']
+                app.wizard.restored_connect = True
 
 
 def process_local(config):
     """Process local section"""
     local = config[LOCAL]
     for option in config.options(LOCAL):
         if option == 'enable':
-            app.wizard.enable = local['enable']
+            if local['enable']:
+                app.wizard.enable = local['enable']
         if option == 'username':
-            app.wizard.username = local['username']
+            if local['username']:
+                app.wizard.username = local['username']
         if option == 'digest':
-            app.wizard.digest = local['digest']
+            if local['digest']:
+                app.wizard.digest = local['digest']
+                app.wizard.restored_digest = True
 
 
 def parse_settings(buffer):
@@ -196,8 +201,6 @@ def wizard_restore_post(req):
     except TimeoutError as exception:
         raise conditions.RequestTimeout() from exception
 
-    app.wizard.restored_settings = True
-
     redirect('/wizard/credentials')