From ade9146920531fcf22cdf8c267d9f5d0d2ec380e Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 09:30:49 -0800 Subject: [PATCH 1/7] [ATS] Deprecate journal auth refreshes --- pkgs/python-packages/flasks/authui/authui.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/python-packages/flasks/authui/authui.py b/pkgs/python-packages/flasks/authui/authui.py index f547ea32f..a0e60adfd 100644 --- a/pkgs/python-packages/flasks/authui/authui.py +++ b/pkgs/python-packages/flasks/authui/authui.py @@ -43,11 +43,11 @@ def expanduser_for(user, path): "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")), - }, + # "journal": { + # "name": "Journal", + # "secrets_file": expanduser_for("andrew", GPD.getKwargsOrDefault("gmail_secrets_json")), + # "refresh_token": expanduser_for("andrew", GPD.getKwargsOrDefault("journal_refresh_file")), + # }, } generators = {} From 38fc9cd4c17233bedfe4724b5fbcf753cc743b41 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 09:33:41 -0800 Subject: [PATCH 2/7] Update authm.py --- pkgs/bash-packages/authm/authm.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/bash-packages/authm/authm.py b/pkgs/bash-packages/authm/authm.py index 3cda384c4..e395abd58 100644 --- a/pkgs/bash-packages/authm/authm.py +++ b/pkgs/bash-packages/authm/authm.py @@ -55,21 +55,21 @@ def refresh(headless, force): 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 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) From 4d0603d26bc30d56b612a7979560481fdac3cc33 Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sat, 27 Dec 2025 17:34:06 +0000 Subject: [PATCH 3/7] Update changelog --- changes/pr-435.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/pr-435.md diff --git a/changes/pr-435.md b/changes/pr-435.md new file mode 100644 index 000000000..d455a76fe --- /dev/null +++ b/changes/pr-435.md @@ -0,0 +1 @@ +[ATS] Deprecate journal auth refreshes From 5e47161a31a94890844d5d07966efbf0ce937f45 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 09:48:16 -0800 Subject: [PATCH 4/7] Update authm.py --- pkgs/bash-packages/authm/authm.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/bash-packages/authm/authm.py b/pkgs/bash-packages/authm/authm.py index e395abd58..f7fcda776 100644 --- a/pkgs/bash-packages/authm/authm.py +++ b/pkgs/bash-packages/authm/authm.py @@ -40,21 +40,21 @@ 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 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( From 5e9471b998e3e60bba785fbe999afbaf0bec8ff9 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 10:00:37 -0800 Subject: [PATCH 5/7] Update authui.py --- pkgs/python-packages/flasks/authui/authui.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/python-packages/flasks/authui/authui.py b/pkgs/python-packages/flasks/authui/authui.py index a0e60adfd..82399f339 100644 --- a/pkgs/python-packages/flasks/authui/authui.py +++ b/pkgs/python-packages/flasks/authui/authui.py @@ -38,11 +38,11 @@ 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")), - }, + # "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")), From a0a1b254180e3856680d103368afd92f71e54df5 Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sat, 27 Dec 2025 18:07:00 +0000 Subject: [PATCH 6/7] Update changelog --- changes/pr-435.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/pr-435.md b/changes/pr-435.md index d455a76fe..308d09e03 100644 --- a/changes/pr-435.md +++ b/changes/pr-435.md @@ -1 +1 @@ -[ATS] Deprecate journal auth refreshes +[ATS] Deprecate bot and journal auth refreshes From e8dd9e0cb2fcd7badcf5d89944e90f84ddb2ab72 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 10:08:33 -0800 Subject: [PATCH 7/7] Update ats.nix --- pkgs/nixos/profiles/ats.nix | 62 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/nixos/profiles/ats.nix b/pkgs/nixos/profiles/ats.nix index dc0b0be05..a9674d4e3 100644 --- a/pkgs/nixos/profiles/ats.nix +++ b/pkgs/nixos/profiles/ats.nix @@ -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" '' @@ -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" ''