3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add "Sign in with another account" button in AddCloudPrintersView

Browse source 
There are cases where Cura and the browser fall out of sync when it
comes to accounts. In such cases, you may be logged in cura with an
account that has no cloud printers and in the browser with an account
that has printers. So when you press the "Add cloud printer" button,
you are redirected to mycloud and you see cloud printers that are not
detected by Cura (because Cura is in a different acconut). In such
cases, the user can now press the "Sign in with a different account"
link in the "Waiting for cloud response" page, which will log him/her
out in Cura AND in the browser, and then reinitiate the whole
authorization flow, to make sure the accounts are in sync.

CURA-7427
This commit is contained in:
Kostas Karmas 2020-05-11 17:47:09 +02:00
parent 5ccf8e412d
commit b717755f20
3 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cura/OAuth2/AuthorizationService.py
View file

@ -4,7 +4,7 @@
import json
from datetime import datetime, timedelta
from typing import Optional, TYPE_CHECKING
from urllib.parse import urlencode
from urllib.parse import urlencode, quote_plus
import requests.exceptions
from PyQt5.QtCore import QUrl
@ -142,7 +142,7 @@ class AuthorizationService:
self.onAuthStateChanged.emit(logged_in = False)
## Start the flow to become authenticated. This will start a new webbrowser tap, prompting the user to login.
def startAuthorizationFlow(self) -> None:
def startAuthorizationFlow(self, force_logout_from_mycloud = False) -> None:
Logger.log("d", "Starting new OAuth2 flow...")
# Create the tokens needed for the code challenge (PKCE) extension for OAuth2.
@ -173,8 +173,17 @@ class AuthorizationService:
title=i18n_catalog.i18nc("@info:title", "Warning")).show()
return
# Open the authorization page in a new browser window.
QDesktopServices.openUrl(QUrl("{}?{}".format(self._auth_url, query_string)))
# Open the authorization page in a new browser window. If a force logout is requested during the authorization
# flow, the "mycloud logoff" link will be prepended to the authorization url to make sure that the user will be
# logged off from the browser before being redirected to login again. This case is used to sync the accounts
# between Cura and the browser.
auth_url = "{}?{}".format(self._auth_url, query_string)
if force_logout_from_mycloud:
mycloud_logoff_link = "https://mycloud.ultimaker.com/logoff"
logoff_auth_url = "{}?next={}".format(mycloud_logoff_link, quote_plus(auth_url))
QDesktopServices.openUrl(QUrl(logoff_auth_url))
else:
QDesktopServices.openUrl(QUrl(auth_url))
## Callback method for the authentication flow.