3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

If saved authentication is wrong, it's now correctly reset

Browse source 
CURA-2295
This commit is contained in:
Jaime van Kessel 2016-09-07 14:25:24 +02:00
parent 97892273fc
commit 1f3c8e0939
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NetworkPrinterOutputDevice.py
View file

@ -232,6 +232,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._authentication_requested_message.setProgress(0) self._authentication_requested_message.setProgress(0)
self._authentication_id = None self._authentication_id = None
self._authentication_key = None self._authentication_key = None
self._createNetworkManager() # Re-create network manager to force re-authentication.
## Request data from the connected device. ## Request data from the connected device.
def _update(self): def _update(self):
@ -394,6 +395,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._not_authenticated_message = Message(i18n_catalog.i18nc("@info:status", self._not_authenticated_message = Message(i18n_catalog.i18nc("@info:status",
"Not authenticated to print with this machine. Unable to start a new job.")) "Not authenticated to print with this machine. Unable to start a new job."))
self._not_authenticated_message.show() self._not_authenticated_message.show()
Logger.log("d", "Attempting to perform an action without authentication. Auth state is %s", self._authentication_state)
return return
Application.getInstance().showPrintMonitor.emit(True) Application.getInstance().showPrintMonitor.emit(True)
@ -747,7 +749,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("i", "Not authenticated. Attempting to request authentication") Logger.log("i", "Not authenticated. Attempting to request authentication")
self._requestAuthentication() self._requestAuthentication()
elif status_code == 403: elif status_code == 403:
pass # If we already had an auth (eg; didn't request one), we only need a single 403 to see it as denied.
if self._authentication_state != AuthState.AuthenticationRequested:
self.setAuthenticationState(AuthState.AuthenticationDenied)
elif status_code == 200: elif status_code == 200:
self.setAuthenticationState(AuthState.Authenticated) self.setAuthenticationState(AuthState.Authenticated)
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()