[core/cli/api] Use authorization code for login

This still seems to work.

Fixes #468
This commit is contained in:
derrod 2022-09-01 02:19:12 +02:00
parent 5a20f12461
commit b136748168
3 changed files with 40 additions and 22 deletions

View file

@ -87,7 +87,7 @@ class EPCAPI:
return self.user return self.user
def start_session(self, refresh_token: str = None, exchange_token: str = None, def start_session(self, refresh_token: str = None, exchange_token: str = None,
client_credentials: bool = False) -> dict: authorization_code: str = None, client_credentials: bool = False) -> dict:
if refresh_token: if refresh_token:
params = dict(grant_type='refresh_token', params = dict(grant_type='refresh_token',
refresh_token=refresh_token, refresh_token=refresh_token,
@ -96,6 +96,10 @@ class EPCAPI:
params = dict(grant_type='exchange_code', params = dict(grant_type='exchange_code',
exchange_code=exchange_token, exchange_code=exchange_token,
token_type='eg1') token_type='eg1')
elif authorization_code:
params = dict(grant_type='authorization_code',
code=authorization_code,
token_type='eg1')
elif client_credentials: elif client_credentials:
params = dict(grant_type='client_credentials', params = dict(grant_type='client_credentials',
token_type='eg1') token_type='eg1')

View file

@ -143,6 +143,7 @@ class LegendaryCLI:
exit(1) exit(1)
exchange_token = '' exchange_token = ''
auth_code = ''
if not args.auth_code and not args.session_id: if not args.auth_code and not args.session_id:
# only import here since pywebview import is slow # only import here since pywebview import is slow
from legendary.utils.webview_login import webview_available, do_webview_login from legendary.utils.webview_login import webview_available, do_webview_login
@ -150,22 +151,18 @@ class LegendaryCLI:
if not webview_available or args.no_webview or self.core.webview_killswitch: if not webview_available or args.no_webview or self.core.webview_killswitch:
# unfortunately the captcha stuff makes a complete CLI login flow kinda impossible right now... # unfortunately the captcha stuff makes a complete CLI login flow kinda impossible right now...
print('Please login via the epic web login!') print('Please login via the epic web login!')
webbrowser.open( url = 'https://legendary.gl/epiclogin'
'https://www.epicgames.com/id/login?redirectUrl=' webbrowser.open(url)
'https%3A%2F%2Fwww.epicgames.com%2Fid%2Fapi%2Fredirect' print(f'If the web page did not open automatically, please manually open the following URL: {url}')
) auth_code = input('Please enter the "authorizationCode" value from the JSON response: ')
print('If the web page did not open automatically, please manually open the following URL: ' auth_code = auth_code.strip()
'https://www.epicgames.com/id/login?redirectUrl=https://www.epicgames.com/id/api/redirect') if auth_code[0] == '{':
sid = input('Please enter the "sid" value from the JSON response: ') tmp = json.loads(auth_code)
sid = sid.strip() auth_code = tmp['authorizationCode']
if sid[0] == '{':
tmp = json.loads(sid)
sid = tmp['sid']
else: else:
sid = sid.strip('"') auth_code = auth_code.strip('"')
exchange_token = self.core.auth_sid(sid)
else: else:
if do_webview_login(callback_code=self.core.auth_code): if do_webview_login(callback_code=self.core.auth_ex_token):
logger.info(f'Successfully logged in as "{self.core.lgd.userdata["displayName"]}" via WebView') logger.info(f'Successfully logged in as "{self.core.lgd.userdata["displayName"]}" via WebView')
else: else:
logger.error('WebView login attempt failed, please see log for details.') logger.error('WebView login attempt failed, please see log for details.')
@ -173,13 +170,17 @@ class LegendaryCLI:
elif args.session_id: elif args.session_id:
exchange_token = self.core.auth_sid(args.session_id) exchange_token = self.core.auth_sid(args.session_id)
elif args.auth_code: elif args.auth_code:
exchange_token = args.auth_code auth_code = args.auth_code
elif args.ex_token:
exchange_token = args.ex_token
if not exchange_token: if not exchange_token and not auth_code:
logger.fatal('No exchange token, cannot login.') logger.fatal('No exchange token/authorization code, cannot login.')
return return
if self.core.auth_code(exchange_token): if exchange_token and self.core.auth_ex_token(exchange_token):
logger.info(f'Successfully logged in as "{self.core.lgd.userdata["displayName"]}"')
elif auth_code and self.core.auth_code(auth_code):
logger.info(f'Successfully logged in as "{self.core.lgd.userdata["displayName"]}"') logger.info(f'Successfully logged in as "{self.core.lgd.userdata["displayName"]}"')
else: else:
logger.error('Login attempt failed, please see log for details.') logger.error('Login attempt failed, please see log for details.')
@ -2620,8 +2621,10 @@ def main():
# Flags # Flags
auth_parser.add_argument('--import', dest='import_egs_auth', action='store_true', auth_parser.add_argument('--import', dest='import_egs_auth', action='store_true',
help='Import Epic Games Launcher authentication data (logs out of EGL)') help='Import Epic Games Launcher authentication data (logs out of EGL)')
auth_parser.add_argument('--code', dest='auth_code', action='store', metavar='<exchange code>', auth_parser.add_argument('--code', dest='auth_code', action='store', metavar='<authorization code>',
help='Use specified exchange code instead of interactive authentication') help='Use specified authorization code instead of interactive authentication')
auth_parser.add_argument('--token', dest='ex_token', action='store', metavar='<exchange token>',
help='Use specified exchange token instead of interactive authentication')
auth_parser.add_argument('--sid', dest='session_id', action='store', metavar='<session id>', auth_parser.add_argument('--sid', dest='session_id', action='store', metavar='<session id>',
help='Use specified session id instead of interactive authentication') help='Use specified session id instead of interactive authentication')
auth_parser.add_argument('--delete', dest='auth_delete', action='store_true', auth_parser.add_argument('--delete', dest='auth_delete', action='store_true',

View file

@ -131,7 +131,18 @@ class LegendaryCore:
def auth_code(self, code) -> bool: def auth_code(self, code) -> bool:
""" """
Handles authentication via exchange code (either retrieved manually or automatically) Handles authentication via authorization code (either retrieved manually or automatically)
"""
try:
self.lgd.userdata = self.egs.start_session(authorization_code=code)
return True
except Exception as e:
self.log.error(f'Logging in failed with {e!r}, please try again.')
return False
def auth_ex_token(self, code) -> bool:
"""
Handles authentication via exchange token (either retrieved manually or automatically)
""" """
try: try:
self.lgd.userdata = self.egs.start_session(exchange_token=code) self.lgd.userdata = self.egs.start_session(exchange_token=code)