detached 70ea140

fix(auth): resolve token from pass store in auth status

commit
70ea140cb45950d7c6e91cfe18be239f6c2fccae
author
brice · · 2026-03-22 19:17 UTC
parent
f03ab25
signature
GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
2 files · +16 -1
M internal/adapters/in/cli/auth.go +2 -1
@@ -743,8 +743,9 @@ func runAuthStatus(remoteNameArg string) error {
743743 }
744744
745745 // Create client
746+ token := remote.ResolveTokenForRemote(remoteName, remoteConfig)
746747 insecureTLS := remote.ResolveInsecureTLSForRemote(insecureTLSFlag, remoteName)
747- client := remote.NewClient(remoteConfig.URL, remoteClientOptions(remoteConfig.Token, insecureTLS)...)
748+ client := remote.NewClient(remoteConfig.URL, remoteClientOptions(token, insecureTLS)...)
748749
749750 // Verify auth
750751 ctx := context.Background()
@@ -743,8 +743,9 @@ func runAuthStatus(remoteNameArg string) error {
743 }743 }
744 744
745 // Create client745 // Create client
746+ token := remote.ResolveTokenForRemote(remoteName, remoteConfig)
746 insecureTLS := remote.ResolveInsecureTLSForRemote(insecureTLSFlag, remoteName)747 insecureTLS := remote.ResolveInsecureTLSForRemote(insecureTLSFlag, remoteName)
747- client := remote.NewClient(remoteConfig.URL, remoteClientOptions(remoteConfig.Token, insecureTLS)...)748+ client := remote.NewClient(remoteConfig.URL, remoteClientOptions(token, insecureTLS)...)
748 749
749 // Verify auth750 // Verify auth
750 ctx := context.Background()751 ctx := context.Background()
M internal/adapters/in/cli/remote/config.go +14 -0
@@ -256,6 +256,20 @@ func resolveRemoteEntryToken(remote *RemoteEntry) string {
256256 return ""
257257 }
258258
259+// ResolveTokenForRemote resolves the token for a named remote.
260+// Precedence: TOML token field > token_env > pass store.
261+func ResolveTokenForRemote(name string, entry RemoteEntry) string {
262+ if token := resolveRemoteEntryToken(&entry); token != "" {
263+ return token
264+ }
265+ if passAvailable() {
266+ if token, err := passReadToken(name); err == nil && token != "" {
267+ return token
268+ }
269+ }
270+ return ""
271+}
272+
259273 // ResolveInsecureTLSForRemote resolves insecure TLS behavior for a named remote.
260274 // Precedence: flag > env > client config > specific remote config.
261275 func ResolveInsecureTLSForRemote(flagInsecure bool, remoteName string) bool {
@@ -256,6 +256,20 @@ func resolveRemoteEntryToken(remote *RemoteEntry) string {
256 return ""256 return ""
257 }257 }
258 258
259+// ResolveTokenForRemote resolves the token for a named remote.
260+// Precedence: TOML token field > token_env > pass store.
261+func ResolveTokenForRemote(name string, entry RemoteEntry) string {
262+ if token := resolveRemoteEntryToken(&entry); token != "" {
263+ return token
264+ }
265+ if passAvailable() {
266+ if token, err := passReadToken(name); err == nil && token != "" {
267+ return token
268+ }
269+ }
270+ return ""
271+}
272+
259 // ResolveInsecureTLSForRemote resolves insecure TLS behavior for a named remote.273 // ResolveInsecureTLSForRemote resolves insecure TLS behavior for a named remote.
260 // Precedence: flag > env > client config > specific remote config.274 // Precedence: flag > env > client config > specific remote config.
261 func ResolveInsecureTLSForRemote(flagInsecure bool, remoteName string) bool {275 func ResolveInsecureTLSForRemote(flagInsecure bool, remoteName string) bool {

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 7

Tags 106

↑↓ moveenter openesc close