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

Jump to bottom

WPB-14284 personal user invitation URL configmap fixed #4341

Merged
merged 3 commits into from
Nov 15, 2024
Merged

WPB-14284 personal user invitation URL configmap fixed #4341

merged 3 commits into from
Nov 15, 2024
+27 −4

Conversation

battermann
Copy link
Contributor

@battermann battermann commented Nov 14, 2024 •
edited
Loading

https://wearezeta.atlassian.net/browse/WPB-14284

This in combination with the caillaich PR https://github.com/zinfra/cailleach/pull/2380 should fix the setting for the team invitation URL for personal users.

The brig server configs in some environments have the field emailSMS.team set, in which case the invitation URL set there as tExistingUserInvitationUrl. If emailSMS.team does not exist, the URL is constructed from externalUrls.accountPages.

So depending on the environment, a correct config must contain either a value for emailSMS.team.tExistingUserInvitationUrl or for externalUrls.accountPages.

Checklist

  • Merge the cailleach PR first
  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Nov 14, 2024
pcapriotti
pcapriotti approved these changes Nov 15, 2024
View reviewed changes
Copy link
Contributor

@pcapriotti pcapriotti left a comment

Choose a reason for hiding this comment

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

LGTM

@battermann battermann marked this pull request as ready for review November 15, 2024 10:04
@battermann battermann merged commit cb83614 into develop Nov 15, 2024
10 checks passed
@battermann battermann deleted the WPB-14284-fix-invitation-url-templates branch November 15, 2024 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pcapriotti pcapriotti pcapriotti approved these changes

Assignees
No one assigned
Labels
echoes/initiative: personal-users-to-team-users... ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@battermann @pcapriotti @zebot