Use request.CTX instead of *request.Context (#24877)
* Use request.CTX instead of *request.Context * Fix tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
37dc35c1a1
Коммит
c7461751f2
@@ -687,7 +687,7 @@ func closeBody(r *http.Response) {
|
||||
type MattermostTestProvider struct {
|
||||
}
|
||||
|
||||
func (m *MattermostTestProvider) GetUserFromJSON(_ *request.Context, data io.Reader, tokenUser *model.User) (*model.User, error) {
|
||||
func (m *MattermostTestProvider) GetUserFromJSON(_ request.CTX, data io.Reader, tokenUser *model.User) (*model.User, error) {
|
||||
var user model.User
|
||||
if err := json.NewDecoder(data).Decode(&user); err != nil {
|
||||
return nil, err
|
||||
@@ -696,15 +696,15 @@ func (m *MattermostTestProvider) GetUserFromJSON(_ *request.Context, data io.Rea
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (m *MattermostTestProvider) GetSSOSettings(_ *request.Context, config *model.Config, service string) (*model.SSOSettings, error) {
|
||||
func (m *MattermostTestProvider) GetSSOSettings(_ request.CTX, config *model.Config, service string) (*model.SSOSettings, error) {
|
||||
return &config.GitLabSettings, nil
|
||||
}
|
||||
|
||||
func (m *MattermostTestProvider) GetUserFromIdToken(_ *request.Context, token string) (*model.User, error) {
|
||||
func (m *MattermostTestProvider) GetUserFromIdToken(_ request.CTX, token string) (*model.User, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (m *MattermostTestProvider) IsSameUser(_ *request.Context, dbUser, oauthUser *model.User) bool {
|
||||
func (m *MattermostTestProvider) IsSameUser(_ request.CTX, dbUser, oauthUser *model.User) bool {
|
||||
return dbUser.AuthData == oauthUser.AuthData
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ type SystemBrowser struct {
|
||||
MakeDefaultString string
|
||||
}
|
||||
|
||||
func renderUnsupportedBrowser(ctx *request.Context, r *http.Request) templates.Data {
|
||||
func renderUnsupportedBrowser(ctx request.CTX, r *http.Request) templates.Data {
|
||||
data := templates.Data{
|
||||
Props: map[string]any{
|
||||
"DownloadAppOrUpgradeBrowserString": ctx.T("web.error.unsupported_browser.download_app_or_upgrade_browser"),
|
||||
@@ -90,7 +90,7 @@ func renderUnsupportedBrowser(ctx *request.Context, r *http.Request) templates.D
|
||||
return data
|
||||
}
|
||||
|
||||
func renderMattermostAppMac(ctx *request.Context) MattermostApp {
|
||||
func renderMattermostAppMac(ctx request.CTX) MattermostApp {
|
||||
return MattermostApp{
|
||||
"/static/images/browser-icons/mac.png",
|
||||
ctx.T("web.error.unsupported_browser.download_the_app"),
|
||||
@@ -102,7 +102,7 @@ func renderMattermostAppMac(ctx *request.Context) MattermostApp {
|
||||
}
|
||||
}
|
||||
|
||||
func renderMattermostAppWindows(ctx *request.Context) MattermostApp {
|
||||
func renderMattermostAppWindows(ctx request.CTX) MattermostApp {
|
||||
return MattermostApp{
|
||||
"/static/images/browser-icons/windows.svg",
|
||||
ctx.T("web.error.unsupported_browser.download_the_app"),
|
||||
@@ -114,7 +114,7 @@ func renderMattermostAppWindows(ctx *request.Context) MattermostApp {
|
||||
}
|
||||
}
|
||||
|
||||
func renderBrowserChrome(ctx *request.Context) Browser {
|
||||
func renderBrowserChrome(ctx request.CTX) Browser {
|
||||
return Browser{
|
||||
"/static/images/browser-icons/chrome.svg",
|
||||
ctx.T("web.error.unsupported_browser.browser_title.chrome"),
|
||||
@@ -124,7 +124,7 @@ func renderBrowserChrome(ctx *request.Context) Browser {
|
||||
}
|
||||
}
|
||||
|
||||
func renderBrowserFirefox(ctx *request.Context) Browser {
|
||||
func renderBrowserFirefox(ctx request.CTX) Browser {
|
||||
return Browser{
|
||||
"/static/images/browser-icons/firefox.svg",
|
||||
ctx.T("web.error.unsupported_browser.browser_title.firefox"),
|
||||
@@ -134,7 +134,7 @@ func renderBrowserFirefox(ctx *request.Context) Browser {
|
||||
}
|
||||
}
|
||||
|
||||
func renderBrowserSafari(ctx *request.Context) Browser {
|
||||
func renderBrowserSafari(ctx request.CTX) Browser {
|
||||
return Browser{
|
||||
"/static/images/browser-icons/safari.svg",
|
||||
ctx.T("web.error.unsupported_browser.browser_title.safari"),
|
||||
@@ -144,7 +144,7 @@ func renderBrowserSafari(ctx *request.Context) Browser {
|
||||
}
|
||||
}
|
||||
|
||||
func renderSystemBrowserEdge(ctx *request.Context, r *http.Request) SystemBrowser {
|
||||
func renderSystemBrowserEdge(ctx request.CTX, r *http.Request) SystemBrowser {
|
||||
return SystemBrowser{
|
||||
"/static/images/browser-icons/edge.svg",
|
||||
ctx.T("web.error.unsupported_browser.browser_title.edge"),
|
||||
|
||||
Ссылка в новой задаче
Block a user