Skip to content

RENKU_ODA_TOKEN_FILE token file name #263

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

Closed
burnout87 wants to merge 2 commits into from
Closed

RENKU_ODA_TOKEN_FILE token file name #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5a7cbd
RENKU_ODA_TOKEN_FILE token file name
burnout87 Jul 9, 2024
6a46c67
Merge branch 'master' into renku-oda-token-file
burnout87 Jul 30, 2024
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
9 changes: 8 additions & 1 deletion oda_api/token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ class TokenLocation(Enum):
FILE_HOME = "file in home"
CONTEXT_FILE = "context file current directory"

class TokenFileName(Enum):
ODA_TOKEN_FILE = ".oda-token"
RENKU_ODA_TOKEN_FILE = "oda-token"

try:
import jwt
except ImportError:
Expand Down Expand Up @@ -329,8 +333,11 @@ def discover_token_and_method(
if n == TokenLocation.ODA_ENV_VAR:
token = environ['ODA_TOKEN'].strip()
elif n == TokenLocation.FILE_CUR_DIR:
with open(path.join(getcwd(), ".oda-token")) as ft:
with open(path.join(getcwd(), TokenFileName.ODA_TOKEN_FILE.value)) as ft:
token = ft.read().strip()
if token is None:
with open(path.join(getcwd(), TokenFileName.RENKU_ODA_TOKEN_FILE.value)) as ft:
token = ft.read().strip()
elif n == TokenLocation.FILE_HOME:
with open(path.join(environ["HOME"], ".oda-token")) as ft:
token = ft.read().strip()
Expand Down