Skip to content
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

Ignore sync uid in case confirmable mail changed #1407

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Ignore sync uid in case confirmable mail changed #1407

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
115f32f
Ignore sync uid in case confirmable mail changed
pnghai Jun 5, 2020
95a6453
Update user_omniauth_callbacks.rb
pnghai Jun 5, 2020
aa415f4
Update user_omniauth_callbacks.rb
pnghai Jun 5, 2020
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
3 changes: 3 additions & 0 deletions app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def email_provider?
end

def sync_uid
if devise_modules.include?(:confirmable) && !@bypass_confirmation_postpone
return if postpone_email_change?
end
self.uid = email if email_provider?
end
end