3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Authentication message is now shown when authenticating

Browse source 
CURA-49
This commit is contained in:
Jaime van Kessel 2016-06-29 10:18:02 +02:00
parent c13a6966d0
commit c8ba60fad4
1 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
NetworkPrinterOutputDevice.py
View file

@ -81,6 +81,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._authentication_id = None self._authentication_id = None
self._authentication_key = None self._authentication_key = None
self._authentication_requested_message = Message(i18n_catalog.i18nc("@info:status", "Requested access. Please aprove the request on the printer"), lifetime = 0, dismissable = False)
self._camera_image = QImage() self._camera_image = QImage()
def _onAuthenticationRequired(self, reply, authenticator): def _onAuthenticationRequired(self, reply, authenticator):
@ -118,6 +119,16 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
image_request = QNetworkRequest(url) image_request = QNetworkRequest(url)
self._manager.get(image_request) self._manager.get(image_request)
def setAuthenticationState(self, auth_state):
if auth_state == AuthState.AuthenticationRequested:
self._authentication_requested_message.show()
elif auth_state == AuthState.Authenticated:
self._authentication_requested_message.hide()
elif auth_state == AuthState.AuthenticationDenied:
self._authentication_requested_message.hide()
self._authentication_state = auth_state
def _update(self): def _update(self):
if self._authentication_state in [AuthState.NotAuthenticated, AuthState.AuthenticationRequested]: if self._authentication_state in [AuthState.NotAuthenticated, AuthState.AuthenticationRequested]:
self._checkAuthentication() self._checkAuthentication()
@ -254,7 +265,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
url = QUrl("http://" + self._address + self._api_prefix + "auth/request") url = QUrl("http://" + self._address + self._api_prefix + "auth/request")
request = QNetworkRequest(url) request = QNetworkRequest(url)
request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json") request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
self._authentication_state = AuthState.AuthenticationRequested self.setAuthenticationState(AuthState.AuthenticationRequested)
self._manager.post(request, json.dumps({"application": "Cura", "user":"test"}).encode()) self._manager.post(request, json.dumps({"application": "Cura", "user":"test"}).encode())
## Handler for all requests that have finished. ## Handler for all requests that have finished.
@ -290,19 +301,25 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self.newImage.emit() self.newImage.emit()
elif "auth/verify" in reply.url().toString(): # Answer when requesting authentication elif "auth/verify" in reply.url().toString(): # Answer when requesting authentication
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 401: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 401:
if self._authentication_state != AuthState.AuthenticationRequested:
# Only request a new authentication when we have not already done so.
Logger.log("i", "Not authenticated. Attempting to request authentication") Logger.log("i", "Not authenticated. Attempting to request authentication")
self._requestAuthentication() self._requestAuthentication()
elif reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 403:
print("403")
else: else:
self._authenticated = AuthState.Authenticated self.setAuthenticationState(AuthState.Authenticated)
Logger.log("i", "Authentication succeeded") Logger.log("i", "Authentication succeeded")
elif "auth/check" in reply.url().toString(): # Check if we are authenticated (user can refuse this!) elif "auth/check" in reply.url().toString(): # Check if we are authenticated (user can refuse this!)
data = json.loads(bytes(reply.readAll()).decode("utf-8")) data = json.loads(bytes(reply.readAll()).decode("utf-8"))
print("auth check response")
if data.get("message", "") == "authorized": if data.get("message", "") == "authorized":
Logger.log("i", "Authentication completed.") Logger.log("i", "Authentication completed.")
self._authentication_state = AuthState.Authenticated self.setAuthenticationState(AuthState.Authenticated)
else: else:
Logger.log("i", "Authentication was denied.") pass
self._authentication_state = AuthState.AuthenticationDenied #Logger.log("i", "Authentication was denied.")
#self.setAuthenticationState(AuthState.AuthenticationDenied)
elif reply.operation() == QNetworkAccessManager.PostOperation: elif reply.operation() == QNetworkAccessManager.PostOperation:
if "/auth/request" in reply.url().toString(): if "/auth/request" in reply.url().toString():