Skip to content

[ATS] Deprecate bot and journal auth refreshes #435

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
goromal merged 7 commits into from
Dec 27, 2025
Merged

[ATS] Deprecate bot and journal auth refreshes #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ade9146
[ATS] Deprecate journal auth refreshes
goromal Dec 27, 2025
38fc9cd
Update authm.py
goromal Dec 27, 2025
4d0603d
Update changelog
goromal-bot Dec 27, 2025
5e47161
Update authm.py
goromal Dec 27, 2025
5e9471b
Update authui.py
goromal Dec 27, 2025
a0a1b25
Update changelog
goromal-bot Dec 27, 2025
e8dd9e0
Update ats.nix
goromal Dec 27, 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
1 change: 1 addition & 0 deletions changes/pr-435.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[ATS] Deprecate bot and journal auth refreshes
60 changes: 30 additions & 30 deletions pkgs/bash-packages/authm/authm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,36 @@ def refresh(headless, force):
f"Refresh of {GPD.getKwargsOrDefault('gmail_refresh_file')} needed."
)
exit(1)
print(Fore.YELLOW + "Refreshing Bot Tokens..." + Style.RESET_ALL)
try:
getGoogleService(
"gmail",
"v1",
GPD.getKwargsOrDefault("gmail_secrets_json"),
GPD.getKwargsOrDefault("gbot_refresh_file"),
headless=headless,
force=force,
)
except CredentialsRefreshException:
sys.stderr.write(
f"Refresh of {GPD.getKwargsOrDefault('gbot_refresh_file')} needed."
)
exit(1)
print(Fore.YELLOW + "Refreshing Journal Tokens..." + Style.RESET_ALL)
try:
getGoogleService(
"gmail",
"v1",
GPD.getKwargsOrDefault("gmail_secrets_json"),
GPD.getKwargsOrDefault("journal_refresh_file"),
headless=headless,
force=force,
)
except CredentialsRefreshException:
sys.stderr.write(
f"Refresh of {GPD.getKwargsOrDefault('journal_refresh_file')} needed."
)
exit(1)
# print(Fore.YELLOW + "Refreshing Bot Tokens..." + Style.RESET_ALL)
# try:
# getGoogleService(
# "gmail",
# "v1",
# GPD.getKwargsOrDefault("gmail_secrets_json"),
# GPD.getKwargsOrDefault("gbot_refresh_file"),
# headless=headless,
# force=force,
# )
# except CredentialsRefreshException:
# sys.stderr.write(
# f"Refresh of {GPD.getKwargsOrDefault('gbot_refresh_file')} needed."
# )
# exit(1)
# print(Fore.YELLOW + "Refreshing Journal Tokens..." + Style.RESET_ALL)
# try:
# getGoogleService(
# "gmail",
# "v1",
# GPD.getKwargsOrDefault("gmail_secrets_json"),
# GPD.getKwargsOrDefault("journal_refresh_file"),
# headless=headless,
# force=force,
# )
# except CredentialsRefreshException:
# sys.stderr.write(
# f"Refresh of {GPD.getKwargsOrDefault('journal_refresh_file')} needed."
# )
# exit(1)
print(Fore.GREEN + "DONE" + Style.RESET_ALL)


Expand Down
62 changes: 31 additions & 31 deletions pkgs/nixos/profiles/ats.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ with import ../dependencies.nix; {
];
enableOrchestrator = true;
timedOrchJobs = [
{
name = "ats-greeting";
jobShellScript = pkgs.writeShellScript "ats-greeting" ''
sleep 5
authm refresh --headless || { >&2 logger -t authm "authm refresh error!"; exit 1; }
sleep 5
gmail-manager gbot-send 6612105214@vzwpix.com "ats-greeting" \
"[$(date)] 🌞 Hello, world! I'm awake! authm refreshed successfully ✅"
gmail-manager gbot-send andrew.torgesen@gmail.com "ats-greeting" \
"[$(date)] 🌞 Hello, world! I'm awake! authm refreshed successfully ✅"
'';
timerCfg = {
OnBootSec = "1m";
Persistent = false;
};
}
# {
# name = "ats-greeting";
# jobShellScript = pkgs.writeShellScript "ats-greeting" ''
# sleep 5
# authm refresh --headless || { >&2 logger -t authm "authm refresh error!"; exit 1; }
# sleep 5
# gmail-manager gbot-send 6612105214@vzwpix.com "ats-greeting" \
# "[$(date)] 🌞 Hello, world! I'm awake! authm refreshed successfully ✅"
# gmail-manager gbot-send andrew.torgesen@gmail.com "ats-greeting" \
# "[$(date)] 🌞 Hello, world! I'm awake! authm refreshed successfully ✅"
# '';
# timerCfg = {
# OnBootSec = "1m";
# Persistent = false;
# };
# }
{
name = "ats-triaging";
jobShellScript = pkgs.writeShellScript "ats-triaging" ''
Expand Down Expand Up @@ -188,21 +188,21 @@ with import ../dependencies.nix; {
Persistent = false;
};
}
{
name = "ats-refresh-reminder";
jobShellScript = pkgs.writeShellScript "ats-refresh-reminder" ''
authm refresh --headless || { >&2 logger -t authm "authm refresh error!"; exit 1; }
rcrsync copy configs || { >&2 logger -t authm "configs sync error!"; exit 1; }
gmail-manager gbot-send 6612105214@vzwpix.com "Gentle Reminder" \
"[$(date)] 👋 When you have a second, please refresh my credentials at http://$(cat ~/secrets/ats/i.txt)/auth/"
gmail-manager gbot-send andrew.torgesen@gmail.com "Gentle Reminder" \
"[$(date)] 👋 When you have a second, please refresh my credentials at http://$(cat ~/secrets/ats/i.txt)/auth/"
'';
timerCfg = {
OnCalendar = [ "Sun 19:00" ];
Persistent = false;
};
}
# {
# name = "ats-refresh-reminder";
# jobShellScript = pkgs.writeShellScript "ats-refresh-reminder" ''
# authm refresh --headless || { >&2 logger -t authm "authm refresh error!"; exit 1; }
# rcrsync copy configs || { >&2 logger -t authm "configs sync error!"; exit 1; }
# gmail-manager gbot-send 6612105214@vzwpix.com "Gentle Reminder" \
# "[$(date)] 👋 When you have a second, please refresh my credentials at http://$(cat ~/secrets/ats/i.txt)/auth/"
# gmail-manager gbot-send andrew.torgesen@gmail.com "Gentle Reminder" \
# "[$(date)] 👋 When you have a second, please refresh my credentials at http://$(cat ~/secrets/ats/i.txt)/auth/"
# '';
# timerCfg = {
# OnCalendar = [ "Sun 19:00" ];
# Persistent = false;
# };
# }
{
name = "ats-gmail-clean";
jobShellScript = pkgs.writeShellScript "ats-gmail-clean" ''
Expand Down
20 changes: 10 additions & 10 deletions pkgs/python-packages/flasks/authui/authui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ def expanduser_for(user, path):
"secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")),
"refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_refresh_file")),
},
"bot": {
"name": "Bot",
"secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")),
"refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("gbot_refresh_file")),
},
"journal": {
"name": "Journal",
"secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")),
"refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("journal_refresh_file")),
},
# "bot": {
# "name": "Bot",
# "secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")),
# "refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("gbot_refresh_file")),
# },
# "journal": {
# "name": "Journal",
# "secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")),
# "refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("journal_refresh_file")),
# },
}

generators = {}
Expand Down