feat: store the email on the instance - #4934
Merged
MontaGhanmy merged 6 commits intoOct 1, 2026
Merged
MontaGhanmy merged 6 commits into
MontaGhanmy merged 6 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
This was referenced Sep 22, 2026
MontaGhanmy
force-pushed
the
feat/instance-internal-email
branch
from
f459d8d to
73cf9d0
Compare
September 29, 2026 16:20
shepilov
reviewed
Sep 30, 2026
Comment thread
worker/migrations/migrations.go
Outdated
shepilov
reviewed
Sep 30, 2026
Comment thread
model/instance/lifecycle/internal_email.go
Outdated
shepilov
reviewed
Sep 30, 2026
Comment thread
worker/migrations/migrations.go
Outdated
The field holds the owner's email for Twake and classic Cozy instances alike, so it is stored as email, indexed by-email, and the fixer and migration are named after it too. The internalEmail field of the RabbitMQ messages is the platform contract and keeps its name.
SetEmail now takes a lock on the email and checks the by-email index before writing, so two instances cannot end up with the same email, even when they are updated concurrently. The backfill reports such an email as a duplicate instead of an error, and the user.created handler logs it and acks the message, since requeuing it would loop forever.
The emails fixer already backfills every instance, with a dry run and a report of the duplicates across organizations, so it is kept as the single entry point.
shepilov
approved these changes
Oct 1, 2026
MontaGhanmy
added a commit
that referenced
this pull request
Oct 6, 2026
Stacked on #4934. Part 2 of #4796. ## Summary The instance email is now a normalized mirror of the settings email. - `instance.SyncEmail` is the single place that copies the settings email to the instance: normalized, empty values ignored, organization instances skipped (as in the backfill). It goes through `SetEmail`, so the lock and the duplicate check of #4934 apply. An email held by another instance is logged and left out, since the settings update is already saved. - Instance creation fills the email from the settings email. - `lifecycle.Patch` syncs it on every settings update. That covers `PUT /settings/instance`, the admin instance `PATCH` and the RabbitMQ handlers, and any settings update brings back a drifted email. - `user.created` now writes the email to the settings through `lifecycle.Patch` instead of beside them, so there is a single source. - `ConfirmEmailUpdate` (the email change confirmation flow) syncs it too, through the instance service. - `SetEmail` and `FindByEmail` move from `lifecycle` to the `instance` package, so the settings service can reach them. - Fixes `instance.Mock.Update`, which read the second return value of a single-error method and panicked.
This file contains hidden or 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
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.
Summary