From 3d445570dc740053cd801a9379e7895f358f2cb1 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 19 Dec 2021 13:31:43 +0000 Subject: [PATCH 1/2] Reset locale on login (#18023) Backport #18023 Although we reset the locale in a number of places there were several ways of logging in that were missing the same code. Fix #18020 Signed-off-by: Andrew Thornton Co-authored-by: Gusted --- routers/web/user/auth.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go index 4ae00cc8335e6..0592e503e4b15 100644 --- a/routers/web/user/auth.go +++ b/routers/web/user/auth.go @@ -98,10 +98,33 @@ func AutoSignIn(ctx *context.Context) (bool, error) { return false, err } + if err := resetLocale(ctx, u); err != nil { + return false, err + } + middleware.DeleteCSRFCookie(ctx.Resp) return true, nil } +func resetLocale(ctx *context.Context, u *user_model.User) error { + // Language setting of the user overwrites the one previously set + // If the user does not have a locale set, we save the current one. + if len(u.Language) == 0 { + u.Language = ctx.Locale.Language() + if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil { + return err + } + } + + middleware.SetLocaleCookie(ctx.Resp, u.Language, 0) + + if ctx.Locale.Language() != u.Language { + ctx.Locale = middleware.Locale(ctx.Resp, ctx.Req) + } + + return nil +} + func checkAutoLogin(ctx *context.Context) bool { // Check auto-login. isSucceed, err := AutoSignIn(ctx) @@ -738,6 +761,11 @@ func handleOAuth2SignIn(ctx *context.Context, u *models.User, gothUser goth.User log.Error("UpdateExternalUser failed: %v", err) } + if err := resetLocale(ctx, u); err != nil { + ctx.ServerError("resetLocale", err) + return + } + if redirectTo := ctx.GetCookie("redirect_to"); len(redirectTo) > 0 { middleware.DeleteRedirectToCookie(ctx.Resp) ctx.RedirectToFirst(redirectTo) @@ -1447,6 +1475,11 @@ func handleAccountActivation(ctx *context.Context, user *models.User) { log.Error("Error storing session[%s]: %v", ctx.Session.ID(), err) } + if err := resetLocale(ctx, user); err != nil { + ctx.ServerError("resetLocale", err) + return + } + ctx.Flash.Success(ctx.Tr("auth.account_activated")) ctx.Redirect(setting.AppSubURL + "/") } From eff2bc7a5b7fbc76af2f3e38d2d3456f3786a865 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 19 Dec 2021 14:26:36 +0000 Subject: [PATCH 2/2] fix mismerged Signed-off-by: Andrew Thornton --- routers/web/user/auth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go index 0592e503e4b15..d4bd16ae5156f 100644 --- a/routers/web/user/auth.go +++ b/routers/web/user/auth.go @@ -106,12 +106,12 @@ func AutoSignIn(ctx *context.Context) (bool, error) { return true, nil } -func resetLocale(ctx *context.Context, u *user_model.User) error { +func resetLocale(ctx *context.Context, u *models.User) error { // Language setting of the user overwrites the one previously set // If the user does not have a locale set, we save the current one. if len(u.Language) == 0 { u.Language = ctx.Locale.Language() - if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil { + if err := models.UpdateUserCols(u, "language"); err != nil { return err } }