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.

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

[WPB-14310] make existing registration api enterprise aware (cont.) #4437

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from

Conversation

fisx
Copy link
Contributor

@fisx fisx commented Jan 31, 2025

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

Checklist

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

@echoes-hq echoes-hq bot added the echoes/initiative: scale Enterprise Readiness Initiatives label Jan 31, 2025
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Jan 31, 2025
@fisx fisx force-pushed the WPB-14310-make-existing-registration-api-enterprise-aware-3 branch 2 times, most recently from c89fc06 to 0c04736 Compare February 4, 2025 09:36

data DomainRegistration' = DomainRegistration'
{ domain :: Domain,
settings :: DomainRegistrationSettings',
Copy link
Member

@akshaymankar akshaymankar Feb 4, 2025

Choose a reason for hiding this comment

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

Can we make this a Maybe and remove the None case? I think preauthorized can also be outside of this, because its not really a setting, but its just a step in configuration. I think the main logic of wire-server (i.e. regsitrations and logins) are not affected by it being pre-authorized, it is treated the same as not having any config.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, domain was a hickup. and yes, maybe is nicer than none. 👍 bd36d47

Copy link
Contributor Author

Choose a reason for hiding this comment

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

on second thought, the code is using the domain field in DomainRegistration a lot, and if we want to replace that with DomainRegistration', the code change in the logic would explode a little, and the new code wouldn't exactly be more concise.

i'll tentatively add the domain back in, let's see if i can convince you.

@fisx fisx force-pushed the WPB-14310-make-existing-registration-api-enterprise-aware-3 branch 3 times, most recently from 96afdab to ed8021c Compare February 4, 2025 19:13
@fisx fisx force-pushed the WPB-14310-make-existing-registration-api-enterprise-aware-3 branch from 14eb4ab to 2f28c05 Compare February 5, 2025 08:45
@fisx fisx force-pushed the WPB-14310-make-existing-registration-api-enterprise-aware-3 branch from 2a1ece6 to 8493363 Compare February 6, 2025 10:47
@battermann battermann force-pushed the WPB-14310-make-existing-registration-api-enterprise-aware-3 branch from 9fe1e4e to dfadaf9 Compare February 6, 2025 15:06
fisx added 2 commits February 6, 2025 16:25
…ting-registration-api-enterprise-aware-3' into WPB-14310-make-existing-registration-api-enterprise-aware-3
Copy link
Contributor Author

@fisx fisx left a comment

Choose a reason for hiding this comment

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

LGTM! (can't formally approve as i've opened this PR)

libs/wire-api/src/Wire/API/EnterpriseLogin.hs Outdated Show resolved Hide resolved
@fisx fisx marked this pull request as ready for review February 6, 2025 15:28
fisx added 3 commits February 6, 2025 16:29
…ting-registration-api-enterprise-aware-3' into WPB-14310-make-existing-registration-api-enterprise-aware-3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes/initiative: scale Enterprise Readiness Initiatives 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.

4 participants