Skip to content
This repository was archived by the owner on Jul 12, 2023. It is now read-only.

Use realm email to send mail templates #849

Merged
merged 34 commits into from
Oct 20, 2020
Merged

Use realm email to send mail templates #849

merged 34 commits into from
Oct 20, 2020

Conversation

whaught
Copy link
Contributor

@whaught whaught commented Oct 16, 2020

Issue #787

Proposed Changes

  • Use the realm email settings for
    • Invite
    • Email verification
    • Password reset

Release Note

per-realm override of emailer used for invitations, verification, and password reset

@googlebot googlebot added the cla: yes Auto: added by CLA bot when all committers have signed a CLA. label Oct 16, 2020
sethvargo
sethvargo suggested changes Oct 16, 2020
View reviewed changes
pkg/controller/user/send_invite.go Outdated
return nil
}

func (c *Controller) sendInvitationFromRealmEmailer(ctx context.Context, toEmail string) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen this same chunk of code a few times now - can we centralize?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, though it's a little weird with the func passing for compose

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take it you're not a fan of Closure or Lisp? 😄

@whaught whaught changed the title [WIP] Use realm email Use realm email to send mail templates Oct 16, 2020
sethvargo
sethvargo reviewed Oct 16, 2020
View reviewed changes
@whaught whaught mentioned this pull request Oct 19, 2020
Closed
@whaught
Copy link
Contributor Author

whaught commented Oct 19, 2020

/hold

Feel free to review. I think this is good to go, but I don't want it merging the day before the release.

sethvargo
sethvargo approved these changes Oct 19, 2020
View reviewed changes
Copy link
Contributor

@sethvargo sethvargo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sethvargo, whaught

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@whaught
Copy link
Contributor Author

whaught commented Oct 20, 2020

/unhold

.13 release is cut

@google-oss-robot google-oss-robot merged commit abb0922 into google:main Oct 20, 2020
@whaught whaught deleted the use-realm-email branch October 20, 2020 00:29
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jeremyfaller jeremyfaller Awaiting requested review from jeremyfaller

@mikehelmick mikehelmick Awaiting requested review from mikehelmick

1 more reviewer

@sethvargo sethvargo sethvargo approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@sethvargo sethvargo

Labels
cla: yes Auto: added by CLA bot when all committers have signed a CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@whaught @google-oss-robot @sethvargo @googlebot