mirror of
https://gitea.com/gitea/tea.git
synced 2026-03-13 09:13:30 +01:00
## Summary - Introduce `github.com/go-authgate/sdk-go/credstore` to store OAuth tokens securely in the OS keyring (macOS Keychain / Linux Secret Service / Windows Credential Manager), with automatic fallback to an encrypted JSON file - Add `AuthMethod` field to `Login` struct; new OAuth logins are marked `auth_method: oauth` and no longer write `token`/`refresh_token`/`token_expiry` to `config.yml` - Add `GetAccessToken()` / `GetRefreshToken()` / `GetTokenExpiry()` accessors that transparently read from credstore for OAuth logins, with fallback to YAML fields for legacy logins - Update all token reference sites across the codebase to use the new accessors - Non-OAuth logins (token, SSH) are completely unaffected; no migration of existing tokens ## Key files | File | Role | |------|------| | `modules/config/credstore.go` | **New** — credstore wrapper (Load/Save/Delete) | | `modules/config/login.go` | Login struct, token accessors, refresh logic | | `modules/auth/oauth.go` | OAuth flow, token creation / re-authentication | | `modules/api/client.go`, `cmd/login/helper.go`, `cmd/login/oauth_refresh.go` | Token reference updates | | `modules/task/pull_*.go`, `modules/task/repo_clone.go` | Git operation token reference updates | ## Test plan - [x] `go build ./...` compiles successfully - [x] `go test ./...` all tests pass - [x] `tea login add --oauth` completes OAuth flow; verify config.yml has `auth_method: oauth` but no token/refresh_token/token_expiry - [x] `tea repos ls` API calls work (token read from credstore) - [x] `tea login delete <name>` credstore token is also removed - [x] Existing non-OAuth logins continue to work unchanged 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: https://gitea.com/gitea/tea/pulls/926 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Bo-Yi Wu <appleboy.tw@gmail.com> Co-committed-by: Bo-Yi Wu <appleboy.tw@gmail.com>
69 lines
1.9 KiB
Go
69 lines
1.9 KiB
Go
// Copyright 2025 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package login
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"code.gitea.io/tea/modules/auth"
|
|
"code.gitea.io/tea/modules/config"
|
|
|
|
"github.com/urfave/cli/v3"
|
|
)
|
|
|
|
// CmdLoginOAuthRefresh represents a command to refresh an OAuth token
|
|
var CmdLoginOAuthRefresh = cli.Command{
|
|
Name: "oauth-refresh",
|
|
Usage: "Refresh an OAuth token",
|
|
Description: "Manually refresh an expired OAuth token. If the refresh token is also expired, opens a browser for re-authentication.",
|
|
ArgsUsage: "[<login name>]",
|
|
Action: runLoginOAuthRefresh,
|
|
}
|
|
|
|
func runLoginOAuthRefresh(_ context.Context, cmd *cli.Command) error {
|
|
var loginName string
|
|
|
|
// Get login name from args or use default
|
|
if cmd.Args().Len() > 0 {
|
|
loginName = cmd.Args().First()
|
|
} else {
|
|
// Get default login
|
|
login, err := config.GetDefaultLogin()
|
|
if err != nil {
|
|
return fmt.Errorf("no login specified and no default login found: %s", err)
|
|
}
|
|
loginName = login.Name
|
|
}
|
|
|
|
// Get the login from config
|
|
login := config.GetLoginByName(loginName)
|
|
if login == nil {
|
|
return fmt.Errorf("login '%s' not found", loginName)
|
|
}
|
|
|
|
// Check if the login has a refresh token
|
|
if login.GetRefreshToken() == "" {
|
|
return fmt.Errorf("login '%s' does not have a refresh token. It may have been created using a different authentication method", loginName)
|
|
}
|
|
|
|
// Try to refresh the token
|
|
err := auth.RefreshAccessToken(login)
|
|
if err == nil {
|
|
fmt.Printf("Successfully refreshed OAuth token for %s\n", loginName)
|
|
return nil
|
|
}
|
|
|
|
// Refresh failed - fall back to browser-based re-authentication
|
|
fmt.Printf("Token refresh failed: %s\n", err)
|
|
fmt.Println("Opening browser for re-authentication...")
|
|
|
|
if err := auth.ReauthenticateLogin(login); err != nil {
|
|
return fmt.Errorf("re-authentication failed: %s", err)
|
|
}
|
|
|
|
fmt.Printf("Successfully re-authenticated %s\n", loginName)
|
|
return nil
|
|
}
|