Skip to content

Keep the remember me checkbox value when failing the login #16192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 9, 2024
Merged

Keep the remember me checkbox value when failing the login #16192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
611cc5f
Keep the remember me checkbox value when failing the login
yahya-lafhal Oct 8, 2024
e31f545
Update Auth.scala to respect format
yahya-lafhal Oct 8, 2024
b68b7d9
Update AuthUi.scala to respect format
yahya-lafhal Oct 8, 2024
6c43bec
Merge branch 'master' into yahya-lafhal-remember-checkbox-state-on-lo…
ornicar Oct 9, 2024
d459187
use Option not Unit
ornicar Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/controllers/Auth.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ final class Auth(
Firewall:
def redirectTo(url: String) = if HTTPRequest.isXhr(ctx.req) then Ok(s"ok:$url") else Redirect(url)
val referrer = get("referrer").filterNot(env.web.referrerRedirect.sillyLoginReferrers)
val isRemember = api.rememberForm.bindFromRequest().value | true
bindForm(api.loginForm)(
err =>
negotiate(
Unauthorized.page(views.auth.login(err, referrer)),
Unauthorized.page(views.auth.login(err, referrer, isRemember)),
Unauthorized(doubleJsonFormErrorBody(err))
),
(login, pass) =>
Expand All @@ -114,7 +115,7 @@ final class Auth(
negotiate(
err.errors match
case List(FormError("", Seq(err), _)) if is2fa(err) => Ok(err)
case _ => Unauthorized.page(views.auth.login(err, referrer))
case _ => Unauthorized.page(views.auth.login(err, referrer, isRemember))
,
Unauthorized(doubleJsonFormErrorBody(err))
)
Expand All @@ -133,8 +134,7 @@ final class Auth(
case Some(u) =>
lila.mon.security.login.attempt(isEmail, stuffing = stuffing, result = true)
env.user.repo.email(u.id).foreach { _.foreach(garbageCollect(u)) }
val remember = api.rememberForm.bindFromRequest().value | true
authenticateUser(u, remember, Some(redirectTo))
authenticateUser(u, isRemember, Some(redirectTo))
)
}
)
Expand Down
9 changes: 7 additions & 2 deletions modules/web/src/main/ui/AuthUi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ScalatagsTemplate.{ *, given }
final class AuthUi(helpers: Helpers):
import helpers.{ *, given }

def login(form: Form[?], referrer: Option[String])(using Context) =
def login(form: Form[?], referrer: Option[String], isRememberMe: Boolean = true)(using Context) =
def addReferrer(url: String): String = referrer.fold(url)(addQueryParam(url, "referrer", _))
Page(trans.site.signIn.txt())
.js(esmInit("bits.login", "login"))
Expand All @@ -36,7 +36,12 @@ final class AuthUi(helpers: Helpers):
formFields(form("username"), form("password"), none, register = false),
form3.submit(trans.site.signIn(), icon = none),
label(cls := "login-remember")(
input(name := "remember", value := "true", tpe := "checkbox", checked),
input(
name := "remember",
value := "true",
tpe := "checkbox",
isRememberMe.option(checked)
),
trans.site.rememberMe()
)
),
Expand Down