Skip to content

WPB-14284 personal user invitation URL configmap fixed#4341

Merged
battermann merged 3 commits intodevelopfrom
WPB-14284-fix-invitation-url-templates
Nov 15, 2024
Merged

WPB-14284 personal user invitation URL configmap fixed#4341
battermann merged 3 commits intodevelopfrom
WPB-14284-fix-invitation-url-templates

Conversation

@battermann
Copy link
Contributor

@battermann battermann commented Nov 14, 2024

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
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
@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

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

Development

Successfully merging this pull request may close these issues.

3 participants