feat: deprecate xxx_token columns from users table (phase iii) #1614
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kangmingtay
commented
Jun 7, 2024
Comment on lines
-603
to
-604
| case mail.EmailChangeVerification: | ||
| return mailer.EmailChangeMail(r, u, otpNew, otp, referrerURL, externalURL) |
There was a problem hiding this comment.
moved this into it's own function (see sendEmailChangeEmails because we're passing way too many arguments into the function just to satisfy this case
if we were to combine them, the sendEmail function would need to take in:
r *http.Requesttx *storage.Connectionu *models.UseremailActionTypeotp, otpNew stringott, ottNew *models.OneTimeToken
where otpNew and ottNew are only needed in the email change case.
further refactoring can be done in a subsequent PR to use the ott.TokenType rather than passing in an emailActionType
kangmingtay
commented
Jun 7, 2024
internal/api/mail.go
Outdated
Comment on lines
581
to
588
| if config.Mailer.SecureEmailChangeEnabled && u.GetEmail() != "" { | ||
| go func(c chan error) { | ||
| c <- mailer.EmailChangeMail(r, u, ottCurrent, otp, referrerURL, externalURL) | ||
| }(errors) | ||
| } | ||
| go func(c chan error) { | ||
| c <- mailer.EmailChangeMail(r, u, ottNew, otpNew, referrerURL, externalURL) | ||
| }(errors) |
There was a problem hiding this comment.
previously, EmailChangeMail handled multiplexing between the current and new email - i find it alot cleaner for it just to do 1 thing (send the email for email change) and have a separate function that wraps it to decide whether to send 2 emails or just 1 based on whether secure email change is enabled
Pull Request Test Coverage Report for Build 9414598574Details
💛 - Coveralls |
kangmingtay
commented
Jun 7, 2024
hf
approved these changes
Jun 7, 2024
Pull Request Test Coverage Report for Build 9445054800Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
J0
reviewed
Jun 10, 2024
Pull Request Test Coverage Report for Build 9450374191Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce?
This PR removes the the reliance on using the
xxx_tokencolumns in the user model to store information about the token and use theone_time_tokenstable as the single source of truthCreateOneTimeTokennow returns themodels.OneTimeTokenstructDecouple sending the email change emails from the
sendEmailfunction intosendEmailChangeEmailsThis PR does not address changing the
xxx_sent_atcolumns to use theone_time_tokenstable yetDo not merge until phase ii has been deployed for some time