Skip to content

clean: rename env vars #24

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

Merged
costowell merged 1 commit into from
Oct 13, 2025
Merged

clean: rename env vars #24

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
6 changes: 3 additions & 3 deletions config.env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
SLACK_SECRET = os.environ.get('SLACK_SECRET', '')

# GitHub secrets
GITHUB_CLIENT_ID = os.environ.get('GITHUB_ID', '')
GITHUB_SECRET = os.environ.get('GITHUB_SECRET', '')
GITHUB_APP_ID = os.environ.get('GITHUB_APP_ID', '')
GITHUB_OAUTH_CLIENT_ID = os.environ.get('GITHUB_OAUTH_CLIENT_ID', '')
GITHUB_OAUTH_CLIENT_SECRET = os.environ.get('GITHUB_OAUTH_CLIENT_SECRET', '')
GITHUB_APP_CLIENT_ID = os.environ.get('GITHUB_APP_CLIENT_ID', '')
GITHUB_APP_PRIVATE_KEY = os.environ.get('GITHUB_APP_PRIVATE_KEY', '')

# Twitch secrets
Expand Down
11 changes: 6 additions & 5 deletions eac/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,9 @@ def _revoke_slack() -> werkzeug.Response:
@_AUTH.oidc_auth('default')
def _auth_github() -> werkzeug.Response:
# Redirect to github for authorisation
return redirect(_GITHUB_AUTH_URI %
(APP.config['GITHUB_CLIENT_ID'], APP.config['STATE']))
return redirect(
_GITHUB_AUTH_URI %
(APP.config['GITHUB_OAUTH_CLIENT_ID'], APP.config['STATE']))


@APP.route('/github/return', methods=['GET'])
Expand All @@ -164,8 +165,8 @@ def _github_landing() -> tuple[str, int]:
# Get token from github
resp = requests.post(
_GITHUB_TOKEN_URI %
(APP.config['GITHUB_CLIENT_ID'], APP.config['GITHUB_SECRET'],
request.args.get('code')),
(APP.config['GITHUB_OAUTH_CLIENT_ID'],
APP.config['GITHUB_OAUTH_CLIENT_SECRET'], request.args.get('code')),
headers={'Accept': 'application/json'},
timeout=APP.config['REQUEST_TIMEOUT'])
try:
Expand Down Expand Up @@ -209,7 +210,7 @@ def _get_github_jwt() -> str:
payload = {
'iat': int(time.time()),
'exp': int(time.time() + 600),
'iss': APP.config['GITHUB_APP_ID'],
'iss': APP.config['GITHUB_APP_CLIENT_ID'],
}

encoded_jwt = jwt.encode(payload, signing_key, algorithm='RS256')
Expand Down