mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2024-12-22 17:55:27 +00:00
Code Issues Projects Releases Wiki Activity

[utils] Fix webview login on Windows

Browse source
This commit is contained in:
derrod 2022-10-26 18:25:44 +02:00
parent cf22de2bcf
commit f80ceb50f3
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
legendary/utils/webview_login.py
View file

@ -73,6 +73,8 @@ class MockLauncher:
if 'logout' in url and self.callback_sid: if 'logout' in url and self.callback_sid:
# prepare to close browser after logout redirect # prepare to close browser after logout redirect
self.destroy_on_load = True self.destroy_on_load = True
elif 'logout' in url:
self.inject_js = True
def nop(self, *args, **kwargs): def nop(self, *args, **kwargs):
return return
@ -124,10 +126,19 @@ class MockLauncher:
def do_webview_login(callback_sid=None, callback_code=None): def do_webview_login(callback_sid=None, callback_code=None):
api = MockLauncher(callback_sid=callback_sid, callback_code=callback_code) api = MockLauncher(callback_sid=callback_sid, callback_code=callback_code)
url = login_url
if os.name == 'nt':
# On Windows we open the logout URL first to invalidate the current cookies (if any).
# Additionally, we have to disable JS injection for the first load, as otherwise the user
# will get an error for some reason.
url = logout_url
api.inject_js = False
logger.info('Opening Epic Games login window...') logger.info('Opening Epic Games login window...')
# Open logout URL first to remove existing cookies, then redirect to login.
window = webview.create_window(f'Legendary {__version__} - Epic Games Account Login', window = webview.create_window(f'Legendary {__version__} - Epic Games Account Login',
url=logout_url if not callback_sid else login_url, url=url, width=768, height=1024, js_api=api)
width=768, height=1024, js_api=api)
api.window = window api.window = window
window.events.loaded += api.on_loaded window.events.loaded += api.on_loaded