Skip to content

fix: skip OAuth refresh when API key overrides auth #538

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
ericdallo merged 1 commit into from
Jul 17, 2026
Merged

fix: skip OAuth refresh when API key overrides auth #538

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
15 changes: 8 additions & 7 deletions src/eca/features/login.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,14 @@
(on-error (.getMessage e)))))

(defn maybe-renew-auth-token! [{:keys [provider on-renewing on-error]} ctx]
(when-let [expires-at (get-in @(:db* ctx) [:auth provider :expires-at])]
;; Renew 60s before expiration to avoid race between check and request
(when (<= (long expires-at) (+ 60 (quot (System/currentTimeMillis) 1000)))
(when on-renewing
(on-renewing))
(renew-auth! provider ctx
{:on-error on-error}))))
(when-not (f.providers/key-auth-override-warning provider (:config ctx))
(when-let [expires-at (get-in @(:db* ctx) [:auth provider :expires-at])]
;; Renew 60s before expiration to avoid race between check and request
(when (<= (long expires-at) (+ 60 (quot (System/currentTimeMillis) 1000)))
(when on-renewing
(on-renewing))
(renew-auth! provider ctx
{:on-error on-error})))))

(defn renew-expiring-auth-tokens!
"Best-effort proactive renewal of any provider auth tokens that are at/near
Expand Down
18 changes: 18 additions & 0 deletions test/eca/features/login_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,21 @@
(is (= "rotated-session" (get-in @db* [:auth "github-copilot" :api-key])))
(is (= "fresh-session" (get-in @db* [:auth "anthropic" :api-key]))))
(finally (fs/delete-tree tmpdir)))))))

(deftest maybe-renew-auth-token!-skips-when-configured-key-overrides-oauth-test
(testing "an expired saved OAuth token does not block a provider configured with a static key"
(let [db* (atom {:auth {"anthropic" {:type :auth/oauth
:api-key "expired-access"
:refresh-token "expired-refresh"
:expires-at 0}}})
renew-calls* (atom 0)
renewing-calls* (atom 0)]
(with-redefs-fn {#'login/renew-auth! (fn [& _]
(swap! renew-calls* inc))}
#(login/maybe-renew-auth-token!
{:provider "anthropic"
:on-renewing (fn [] (swap! renewing-calls* inc))}
{:db* db*
:config {:providers {"anthropic" {:key "local-proxy-key"}}}}))
(is (zero? @renew-calls*))
(is (zero? @renewing-calls*)))))
Loading