Skip to content

Improve TR log in handling and remove app login code #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RealCLanger wants to merge 1 commit into
base: master
Choose a base branch
from
+111 −237
Open

Improve TR log in handling and remove app login code #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dependencies = [
"coloredlogs",
"cryptography",
"curl_cffi",
"ecdsa",
"packaging",
"pathvalidate",
"pygments",
Expand Down
85 changes: 30 additions & 55 deletions pytr/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

from pygments import formatters, highlight, lexers

from pytr.api import CREDENTIALS_FILE, TradeRepublicApi
from pytr.utils import get_logger
from .api import BASE_DIR, CREDENTIALS_FILE, TradeRepublicApi
from .utils import get_logger


def get_settings(tr):
Expand All @@ -18,32 +18,27 @@ def get_settings(tr):
return formatted_json


def login(phone_no=None, pin=None, web=True, store_credentials=False, waf_token=None):
def login(phone_no=None, pin=None, store_credentials=False, waf_token=None):
"""
If web is true, use web login method, else simulate app login.
Handle credentials parameters and store to credentials file if requested.
If no parameters are set but are needed then ask for input
"""
log = get_logger(__name__)
save_cookies = True

if phone_no is None and CREDENTIALS_FILE.is_file():
log.info("Found credentials file")
with open(CREDENTIALS_FILE) as f:
lines = f.readlines()
phone_no = lines[0].strip()
pin = lines[1].strip()
phone_no_masked = phone_no[:-8] + "********"
pin_masked = len(pin) * "*"
log.info(f"Phone: {phone_no_masked}, PIN: {pin_masked}")
log.info(f"Using credentials from file {CREDENTIALS_FILE}. Phone: {phone_no_masked}, PIN: {pin_masked}")
else:
CREDENTIALS_FILE.parent.mkdir(parents=True, exist_ok=True)
BASE_DIR.mkdir(parents=True, exist_ok=True)
if phone_no is None:
log.info("Credentials file not found")
print("Please enter your TradeRepublic phone number in the format +4912345678:")
phone_no = input()
else:
log.info("Phone number provided as argument")

if pin is None:
print("Please enter your TradeRepublic pin:")
Expand All @@ -53,56 +48,36 @@ def login(phone_no=None, pin=None, web=True, store_credentials=False, waf_token=
with open(CREDENTIALS_FILE, "w") as f:
f.writelines([phone_no + "\n", pin + "\n"])

log.info(f"Saved credentials in {CREDENTIALS_FILE}")
log.info(f"Storing credentials/cookies in {BASE_DIR}")
else:
save_cookies = False

tr = TradeRepublicApi(phone_no=phone_no, pin=pin, save_cookies=save_cookies, waf_token=waf_token)

if web:
# Use same login as app.traderepublic.com
if tr.resume_websession():
log.info("Web session resumed")
else:
try:
countdown = tr.initiate_weblogin()
except ValueError as e:
log.fatal(str(e))
sys.exit(1)
request_time = time.time()
print("Enter the code you received to your mobile app as a notification.")
print(f"Enter nothing if you want to receive the (same) code as SMS. (Countdown: {countdown})")
code = input("Code: ")
if code == "":
countdown = countdown - (time.time() - request_time)
for remaining in range(int(countdown)):
print(
f"Need to wait {int(countdown - remaining)} seconds before requesting SMS...",
end="\r",
)
time.sleep(1)
print()
tr.resend_weblogin()
code = input("SMS requested. Enter the confirmation code:")
tr.complete_weblogin(code)
else:
# Try to login. Ask for device reset if needed
# Use same login as app.traderepublic.com
if not tr.resume_websession():
try:
tr.login()
except (KeyError, AttributeError):
# old keyfile or no keyfile
print("Error logging in. Reset device? (y)")
confirmation = input()
if confirmation == "y":
tr.initiate_device_reset()
print("You should have received a SMS with a token. Please type it in:")
token = input()
tr.complete_device_reset(token)
print("Reset done")
else:
print("Cancelling reset")
sys.exit(1)
countdown = tr.initiate_weblogin()
except ValueError as e:
log.fatal(str(e))
sys.exit(1)
request_time = time.time()
print("Enter the code you received to your mobile app as a notification.")
print(f"Enter nothing if you want to receive the (same) code as SMS. (Countdown: {countdown})")
code = input("Code: ")
if code == "":
countdown = countdown - (time.time() - request_time)
for remaining in range(int(countdown)):
print(
f"Need to wait {int(countdown - remaining)} seconds before requesting SMS...",
end="\r",
)
time.sleep(1)
print()
tr.resend_weblogin()
code = input("SMS requested. Enter the confirmation code:")
tr.complete_weblogin(code)
log.info("Logged in.")

log.info("Logged in")
# log.debug(get_settings(tr))
log.debug(get_settings(tr))
return tr
Loading