diff --git a/changes/pr-435.md b/changes/pr-435.md new file mode 100644 index 00000000..308d09e0 --- /dev/null +++ b/changes/pr-435.md @@ -0,0 +1 @@ +[ATS] Deprecate bot and journal auth refreshes diff --git a/pkgs/bash-packages/authm/authm.py b/pkgs/bash-packages/authm/authm.py index 3cda384c..f7fcda77 100644 --- a/pkgs/bash-packages/authm/authm.py +++ b/pkgs/bash-packages/authm/authm.py @@ -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) diff --git a/pkgs/nixos/profiles/ats.nix b/pkgs/nixos/profiles/ats.nix index dc0b0be0..a9674d4e 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" '' diff --git a/pkgs/python-packages/flasks/authui/authui.py b/pkgs/python-packages/flasks/authui/authui.py index f547ea32..82399f33 100644 --- a/pkgs/python-packages/flasks/authui/authui.py +++ b/pkgs/python-packages/flasks/authui/authui.py @@ -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 = {}