Skip to content
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

Feature: Re-use token for plex-login with --use-token flag #2126

Merged
merged 3 commits into from
Jan 1, 2025
Merged

Feature: Re-use token for plex-login with --use-token flag #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
973b44a
Re-use ACCOUNT token for plex-token
glensc Nov 26, 2023
fb5c398
Skip asking password if token is provided
glensc Jan 1, 2025
46e3485
Use token only with --use-token flag
glensc Jan 1, 2025
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
5 changes: 5 additions & 0 deletions plextraktsync/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ def env_plex_username():
help="Plex password",
default=lambda: environ.get("PLEX_PASSWORD", None),
)
@click.option(
"--use-token",
is_flag=True,
help="Use saved plex token if available",
)
def plex_login():
"""
Log in to Plex Account to obtain Access Token. Optionally can use managed user on servers that you own.
Expand Down
28 changes: 19 additions & 9 deletions plextraktsync/commands/plex_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,19 @@ def server_urls(server: MyPlexResource):
yield local_url()


def myplex_login(username, password):
def myplex_login(username: str, password: str, token=None, code=None):
while True:
username = Prompt.ask(PROMPT_PLEX_USERNAME, default=username)
password = Prompt.ask(PROMPT_PLEX_PASSWORD, password=True, default=password, show_default=False)
code = Prompt.ask(PROMPT_PLEX_CODE)
if token:
print("Using existing token to login to Plex")
if not token:
username = Prompt.ask(PROMPT_PLEX_USERNAME, default=username)
password = Prompt.ask(PROMPT_PLEX_PASSWORD, password=True, default=password, show_default=False)
code = Prompt.ask(PROMPT_PLEX_CODE)
try:
return MyPlexAccount(username=username, password=password, code=code)
return MyPlexAccount(username=username, password=password, code=code, token=token)
except Unauthorized as e:
if token:
raise e
print(error(f"Log in to Plex failed: '{e}', Try again."), highlight=False)
except BadRequest as e:
raise ClickException(f"Log in to Plex failed: {e}")
Expand Down Expand Up @@ -185,16 +190,21 @@ def plex_login_autoconfig():
login(username, password)


def plex_login(username, password):
login(username, password)
def plex_login(username, password, use_token: bool):
token = None
if use_token:
config = factory.config
token = config["PLEX_ACCOUNT_TOKEN"]

login(username, password, token)


def login(username: str, password: str):
def login(username: str, password: str, token=None):
if factory.has_plex_token:
if not Confirm.ask(PROMPT_PLEX_RELOGIN, default=True):
return

account = myplex_login(username, password)
account = myplex_login(username, password, token)
print(
Panel.fit(
"Login to MyPlex was successful",
Expand Down
Loading