Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
5c47a18c
Commit
5c47a18c
authored
3 years ago
by
Eugen Rochko
Browse files
Options
Download
Email Patches
Plain Diff
Fix login being broken due to inaccurately applied backport fix in 3.4.2
See #16943
parent
8a74d851
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/controllers/auth/sessions_controller.rb
+0
-1
app/controllers/auth/sessions_controller.rb
app/controllers/concerns/sign_in_token_authentication_concern.rb
+0
-1
...trollers/concerns/sign_in_token_authentication_concern.rb
app/controllers/concerns/two_factor_authentication_concern.rb
+0
-2
...controllers/concerns/two_factor_authentication_concern.rb
with
0 additions
and
4 deletions
+0
-4
app/controllers/auth/sessions_controller.rb
+
0
-
1
View file @
5c47a18c
...
...
@@ -24,7 +24,6 @@ class Auth::SessionsController < Devise::SessionsController
def
create
super
do
|
resource
|
resource
.
update_sign_in!
(
request
,
new_sign_in:
true
)
remember_me
(
resource
)
flash
.
delete
(
:notice
)
end
end
...
...
This diff is collapsed.
Click to expand it.
app/controllers/concerns/sign_in_token_authentication_concern.rb
+
0
-
1
View file @
5c47a18c
...
...
@@ -34,7 +34,6 @@ module SignInTokenAuthenticationConcern
def
authenticate_with_sign_in_token_attempt
(
user
)
if
valid_sign_in_token_attempt?
(
user
)
clear_attempt_from_session
remember_me
(
user
)
sign_in
(
user
)
else
flash
.
now
[
:alert
]
=
I18n
.
t
(
'users.invalid_sign_in_token'
)
...
...
This diff is collapsed.
Click to expand it.
app/controllers/concerns/two_factor_authentication_concern.rb
+
0
-
2
View file @
5c47a18c
...
...
@@ -57,7 +57,6 @@ module TwoFactorAuthenticationConcern
if
valid_webauthn_credential?
(
user
,
webauthn_credential
)
clear_attempt_from_session
remember_me
(
user
)
sign_in
(
user
)
render
json:
{
redirect_path:
root_path
},
status: :ok
else
...
...
@@ -68,7 +67,6 @@ module TwoFactorAuthenticationConcern
def
authenticate_with_two_factor_via_otp
(
user
)
if
valid_otp_attempt?
(
user
)
clear_attempt_from_session
remember_me
(
user
)
sign_in
(
user
)
else
flash
.
now
[
:alert
]
=
I18n
.
t
(
'users.invalid_otp_token'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets