mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-10-28 08:35:33 +08:00
* feat(i18n): translate web console messages in the frontend and AI-client errors in the backend
Chinese text was hard-coded in API messages, stored log content, emails and
server logs, so it reached users of every interface language.
Text is now translated where its reader is:
- Web console APIs return the English source text as message_key with
message_params, and the web console translates it in all seven languages.
message keeps the English text for other API callers.
- Errors returned to AI clients, emails and notifications are translated by
the backend (en, zh-CN, zh-TW) in the language saved on the account, then
the language of the request's Accept-Language header.
- A reader who states no language still gets the original Chinese text of the
messages that were Chinese before, word for word. Gateways that use another
new-api as their upstream match that text, for example to disable a channel
whose account ran out of quota.
- Usage, top-up and system log content is stored as content_parts (key and
params) and rendered in the viewer's language. Task fail reasons and refund
reasons written by the gateway are English keys. Rows written earlier are
shown as before.
- Server logs are English.
Also:
- The saved interface language zhTW, and zh-HK, zh-MO and zh-Hant, now select
Traditional Chinese in the backend instead of Simplified Chinese.
- The built-in group descriptions are translated; descriptions an
administrator saved are shown as written.
- .agents/rules/i18n.md records the conventions. Tests in i18n/ fail on a
non-English string literal, on a web console message without translations
and on a locale key without a constant.
* feat(i18n): print server logs in Chinese when LOG_LANGUAGE asks for it
Server log lines are English by default. With LOG_LANGUAGE=zh-CN, the lines
that were Chinese before print their original Chinese text.
common.LogText formats a log line from its English format, which is also the
key of its Chinese text in common/log_text.zh-CN.json. A line without an entry
prints in English. go vet checks the arguments of every call, and
TestServerLogTexts checks that each entry still matches a call and has the
same verbs as its key.
* docs: list LOG_LANGUAGE in the docker compose example
* feat(i18n): translate every server log line and add DEFAULT_LANGUAGE
Every line the gateway prints goes through common.LogText. With
DEFAULT_LANGUAGE=zh-CN, the lines that have a Chinese text in
common/log_text.zh-CN.json print it and the others print English.
DEFAULT_LANGUAGE replaces LOG_LANGUAGE. It also sets the language of
backend messages, emails and notifications for a reader who states no
language: en, zh-CN or zh-TW, English when unset. The list of messages
that stayed Chinese for such readers is removed.
Review fixes:
- Channel test logs store the token name "Model test"; the console shows
it in the interface language.
- Task fail reasons written by the gateway are fixed sentences the console
translates. The HTTP status and the upstream detail go to the server log
when a polled task is failed.
- The auto-disable reason of a slow channel is written in DEFAULT_LANGUAGE.
Also:
- Drop the repository-scanning lint tests, the i18n rules file and its
read gate. AGENTS.md keeps the conventions in four lines.
- Payment error toasts keep their previous text and only add the
translated message key.
- Remove guards and helpers that no caller needs.
* fix(i18n): address review on language lookup, notices and error responses
- Relay requests no longer load the user a second time to find the
language: the settings TokenAuth put into the request are used as they
are, also when they hold no language.
- Upstream model update notices are rendered in each recipient's saved
language, DEFAULT_LANGUAGE when none.
- /api/usage/token and /api/log/token answer with backend-translated
messages again, with the keys and status codes used before this PR.
Their callers are scripts, not the web console.
- Webhook notifications fill {{value}} placeholders like the other
senders. Running the rendered text through Sprintf appended
%!(EXTRA ...) and broke %2F in links.
- RootUserLanguage reads the setting of the root user it already loaded.
- zh_TW and zh_HK are read as Traditional Chinese.
- Add common.ApiErrorStatus for error responses under another HTTP status
and use it where those responses were built by hand.
- Remove middleware.GetLanguage, which had no callers.
198 lines
6.4 KiB
Go
198 lines
6.4 KiB
Go
package oauth
|
|
|
|
import (
|
|
"context"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func init() {
|
|
Register("linuxdo", &LinuxDOProvider{})
|
|
}
|
|
|
|
// LinuxDOProvider implements OAuth for Linux DO
|
|
type LinuxDOProvider struct{}
|
|
|
|
type linuxdoUser struct {
|
|
Id int `json:"id"`
|
|
Username string `json:"username"`
|
|
Name string `json:"name"`
|
|
Active bool `json:"active"`
|
|
TrustLevel int `json:"trust_level"`
|
|
Silenced bool `json:"silenced"`
|
|
}
|
|
|
|
func (p *LinuxDOProvider) GetName() string {
|
|
return "Linux DO"
|
|
}
|
|
|
|
func (p *LinuxDOProvider) IsEnabled() bool {
|
|
return common.LinuxDOOAuthEnabled
|
|
}
|
|
|
|
func (p *LinuxDOProvider) ExchangeToken(ctx context.Context, code string, c *gin.Context) (*OAuthToken, error) {
|
|
if code == "" {
|
|
return nil, NewOAuthError(common.NewMessage(msgInvalidCode))
|
|
}
|
|
|
|
// Get access token using Basic auth
|
|
tokenEndpoint := common.GetEnvOrDefaultString("LINUX_DO_TOKEN_ENDPOINT", "https://connect.linux.do/oauth2/token")
|
|
credentials := common.LinuxDOClientId + ":" + common.LinuxDOClientSecret
|
|
basicAuth := "Basic " + base64.StdEncoding.EncodeToString([]byte(credentials))
|
|
|
|
// Get redirect URI from request
|
|
scheme := "http"
|
|
if c.Request.TLS != nil {
|
|
scheme = "https"
|
|
}
|
|
redirectURI := fmt.Sprintf("%s://%s/api/oauth/linuxdo", scheme, c.Request.Host)
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] ExchangeToken: token_endpoint=%s, redirect_uri=%s", tokenEndpoint, redirectURI)
|
|
|
|
data := url.Values{}
|
|
data.Set("grant_type", "authorization_code")
|
|
data.Set("code", code)
|
|
data.Set("redirect_uri", redirectURI)
|
|
|
|
req, err := http.NewRequestWithContext(ctx, "POST", tokenEndpoint, strings.NewReader(data.Encode()))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
req.Header.Set("Authorization", basicAuth)
|
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
|
req.Header.Set("Accept", "application/json")
|
|
|
|
client := http.Client{Timeout: 5 * time.Second}
|
|
res, err := client.Do(req)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] ExchangeToken error: %s", err.Error()))
|
|
return nil, NewOAuthErrorWithRaw(common.NewMessage(msgConnectFailed, map[string]any{"provider": "Linux DO"}), err.Error())
|
|
}
|
|
defer res.Body.Close()
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] ExchangeToken response status: %d", res.StatusCode)
|
|
|
|
var tokenRes struct {
|
|
AccessToken string `json:"access_token"`
|
|
Message string `json:"message"`
|
|
}
|
|
if err := json.NewDecoder(res.Body).Decode(&tokenRes); err != nil {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] ExchangeToken decode error: %s", err.Error()))
|
|
return nil, err
|
|
}
|
|
|
|
if tokenRes.AccessToken == "" {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] ExchangeToken failed: %s", tokenRes.Message))
|
|
return nil, NewOAuthErrorWithRaw(common.NewMessage(msgTokenFailed, map[string]any{"provider": "Linux DO"}), tokenRes.Message)
|
|
}
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] ExchangeToken success")
|
|
|
|
return &OAuthToken{
|
|
AccessToken: tokenRes.AccessToken,
|
|
}, nil
|
|
}
|
|
|
|
func (p *LinuxDOProvider) GetUserInfo(ctx context.Context, token *OAuthToken) (*OAuthUser, error) {
|
|
userEndpoint := common.GetEnvOrDefaultString("LINUX_DO_USER_ENDPOINT", "https://connect.linux.do/api/user")
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] GetUserInfo: user_endpoint=%s", userEndpoint)
|
|
|
|
req, err := http.NewRequestWithContext(ctx, "GET", userEndpoint, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
req.Header.Set("Authorization", "Bearer "+token.AccessToken)
|
|
req.Header.Set("Accept", "application/json")
|
|
|
|
client := http.Client{Timeout: 5 * time.Second}
|
|
res, err := client.Do(req)
|
|
if err != nil {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] GetUserInfo error: %s", err.Error()))
|
|
return nil, NewOAuthErrorWithRaw(common.NewMessage(msgConnectFailed, map[string]any{"provider": "Linux DO"}), err.Error())
|
|
}
|
|
defer res.Body.Close()
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] GetUserInfo response status: %d", res.StatusCode)
|
|
|
|
var linuxdoUser linuxdoUser
|
|
if err := json.NewDecoder(res.Body).Decode(&linuxdoUser); err != nil {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] GetUserInfo decode error: %s", err.Error()))
|
|
return nil, err
|
|
}
|
|
|
|
if linuxdoUser.Id == 0 {
|
|
logger.LogError(ctx, common.LogText("[OAuth-LinuxDO] GetUserInfo failed: invalid user id"))
|
|
return nil, NewOAuthError(common.NewMessage(msgUserInfoEmpty, map[string]any{"provider": "Linux DO"}))
|
|
}
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] GetUserInfo: id=%d, username=%s, name=%s, trust_level=%d, active=%v, silenced=%v",
|
|
linuxdoUser.Id, linuxdoUser.Username, linuxdoUser.Name, linuxdoUser.TrustLevel, linuxdoUser.Active, linuxdoUser.Silenced)
|
|
|
|
// Check trust level
|
|
if linuxdoUser.TrustLevel < common.LinuxDOMinimumTrustLevel {
|
|
logger.LogWarn(ctx, common.LogText("[OAuth-LinuxDO] GetUserInfo: trust level too low (required=%d, current=%d)",
|
|
common.LinuxDOMinimumTrustLevel, linuxdoUser.TrustLevel))
|
|
return nil, &TrustLevelError{
|
|
Required: common.LinuxDOMinimumTrustLevel,
|
|
Current: linuxdoUser.TrustLevel,
|
|
}
|
|
}
|
|
|
|
logger.LogDebug(ctx, "[OAuth-LinuxDO] GetUserInfo success: id=%d, username=%s", linuxdoUser.Id, linuxdoUser.Username)
|
|
|
|
return &OAuthUser{
|
|
ProviderUserID: strconv.Itoa(linuxdoUser.Id),
|
|
Username: linuxdoUser.Username,
|
|
DisplayName: linuxdoUser.Name,
|
|
Extra: map[string]any{
|
|
"trust_level": linuxdoUser.TrustLevel,
|
|
"active": linuxdoUser.Active,
|
|
"silenced": linuxdoUser.Silenced,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func (p *LinuxDOProvider) IsUserIDTaken(providerUserID string) bool {
|
|
return model.IsLinuxDOIdAlreadyTaken(providerUserID)
|
|
}
|
|
|
|
func (p *LinuxDOProvider) FillUserByProviderID(user *model.User, providerUserID string) error {
|
|
user.LinuxDOId = providerUserID
|
|
return user.FillUserByLinuxDOId()
|
|
}
|
|
|
|
func (p *LinuxDOProvider) SetProviderUserID(user *model.User, providerUserID string) {
|
|
user.LinuxDOId = providerUserID
|
|
}
|
|
|
|
func (p *LinuxDOProvider) GetProviderPrefix() string {
|
|
return "linuxdo_"
|
|
}
|
|
|
|
// ProviderUserIDColumn returns the users-table column storing this provider's user ID.
|
|
func (p *LinuxDOProvider) ProviderUserIDColumn() string {
|
|
return "linux_do_id"
|
|
}
|
|
|
|
// TrustLevelError indicates the user's trust level is too low
|
|
type TrustLevelError struct {
|
|
Required int
|
|
Current int
|
|
}
|
|
|
|
func (e *TrustLevelError) Error() string {
|
|
return "trust level too low"
|
|
}
|