Leahnaya/s3s
1
0
Fork 0
mirror of https://github.com/frozenpandaman/s3s.git synced 2026-04-25 08:08:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve error message on missing session_token (#174)

Browse Source
This commit is contained in:
eli fessler 2024-02-27 22:06:50 +09:00
parent 469c4eff1f
commit c1ea0c5b91
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iksm.py
View File

@ -202,8 +202,6 @@ def log_in(ver, app_user_agent, f_gen_url):
except AttributeError:
print("Malformed URL. Please try again, or press Ctrl+C to exit.")
print("URL:", end=' ')
except KeyError: # session_token not found
print("\nThe URL has expired. Please log out and back into your Nintendo Account and try again.")
sys.exit(1)
@ -233,10 +231,16 @@ def get_session_token(session_token_code, auth_code_verifier):
r = session.post(url, headers=app_head, data=body)
try:
s_t = json.loads(r.text)["session_token"]
container = json.loads(r.text)
s_t = container["session_token"]
except json.decoder.JSONDecodeError:
print("Got non-JSON response from Nintendo (in api/session_token step). Please try again.")
sys.exit(1)
except KeyError:
print("\nThe URL has expired. Logging out & back in to your Nintendo Account and retrying may fix this.")
print("Error from Nintendo (in api/session_token step):")
print(json.dumps(container, indent=2))
sys.exit(1)
return s_t