Skip to content

fix: remove enable_custom_domain_in_emails from managed tenant flags #1401

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

Open
ankita10119 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: remove enable_custom_domain_in_emails from managed tenant flags #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d8536
fix: remove enable_custom_domain_in_emails from managed tenant flags
ankita10119 Jun 12, 2026
901507a
fix: update e2e nock recordings to reflect removal of enable_custom_d…
ankita10119 Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/tools/auth0/handlers/tenant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export const allowedTenantFlags = [
'enable_apis_section',
'enable_pipeline2',
'enable_dynamic_client_registration',
'enable_custom_domain_in_emails',
'allow_legacy_tokeninfo_endpoint',
'enable_legacy_profile',
'enable_idtoken_api2',
Expand Down Expand Up @@ -233,9 +232,9 @@ export default class TenantHandler extends DefaultHandler {

if ((tenant.flags as Record<string, unknown>)?.enable_custom_domain_in_emails !== undefined) {
log.warn(
'The "enable_custom_domain_in_emails" tenant flag is deprecated. ' +
'Use the "is_default" field on customDomains to configure the default domain instead. ' +
'The flag will still be applied for now but will be removed in a future release.'
'The "enable_custom_domain_in_emails" tenant flag is deprecated and has been removed from management. ' +
'It will not be applied during import. ' +
'Use the "is_default" field on customDomains to configure the default domain instead.'
);
Comment on lines 234 to 238

@harshithRai harshithRai Jun 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Now that enable_custom_domain_in_emails is removed from allowedTenantFlags, removeUnallowedTenantFlags() will already emit a generic incompatible flag warning for it.

So in the same import run the user sees two contradictory warnings, one says the flag can likely be removed from their config, the other says it has already been removed from management.

For example, with flags: { enable_custom_domain_in_emails: true } in their config, they'd see:

WARN: The following tenant flag has not been updated because deemed incompatible with the target tenant: enable_custom_domain_in_emails. This flag can likely be removed from the tenant definition file...

WARN: The "enable_custom_domain_in_emails" tenant flag is deprecated and has been removed from management. It will not be applied during import. Use the "is_default" field on customDomains instead.

}

Expand Down
7 changes: 3 additions & 4 deletions .../e2e/recordings/should-deploy-while-deleting-resources-if-AUTH0_ALLOW_DELETE-is-true.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions ...e/recordings/should-deploy-without-deleting-resources-if-AUTH0_ALLOW_DELETE-is-false.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions test/e2e/recordings/should-dump-and-deploy-without-throwing-an-error.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions test/e2e/recordings/should-preserve-keywords-for-directory-format.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions test/e2e/recordings/should-preserve-keywords-for-yaml-format.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion test/e2e/testdata/lots-of-configuration/tenant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ tenant:
change_pwd_flow_v1: false
enable_apis_section: false
enable_client_connections: false
enable_custom_domain_in_emails: false
enable_dynamic_client_registration: false
enable_legacy_logs_search_v2: false
enable_public_signup_user_exists_error: true
Expand Down
1 change: 0 additions & 1 deletion test/e2e/testdata/should-preserve-keywords/directory/tenant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"change_pwd_flow_v1": false,
"enable_apis_section": false,
"enable_client_connections": false,
"enable_custom_domain_in_emails": false,
"enable_dynamic_client_registration": false,
"enable_legacy_logs_search_v2": false,
"enable_public_signup_user_exists_error": true,
Expand Down
1 change: 0 additions & 1 deletion test/e2e/testdata/should-preserve-keywords/yaml/tenant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ tenant:
change_pwd_flow_v1: false
enable_apis_section: false
enable_client_connections: false
enable_custom_domain_in_emails: false
enable_dynamic_client_registration: false
enable_legacy_logs_search_v2: false
enable_public_signup_user_exists_error: true
Expand Down
8 changes: 6 additions & 2 deletions test/tools/auth0/handlers/tenant.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,16 @@ describe('#tenant handler', () => {
await processChanges.apply(handler, [{ tenant: { flags: proposedFlags } }]);
});

it('should log a deprecation warning when enable_custom_domain_in_emails is set', async () => {
it('should log a deprecation warning and not send enable_custom_domain_in_emails to the API', async () => {
const logWarnStub = sinon.stub(log, 'warn');
let capturedPayload: any = null;

const auth0 = {
tenants: {
settings: {
update: async () => {},
update: async (data) => {
capturedPayload = data;
},
},
},
};
Expand All @@ -256,6 +259,7 @@ describe('#tenant handler', () => {
]);

expect(logWarnStub.calledWithMatch('enable_custom_domain_in_emails')).to.equal(true);
expect(capturedPayload?.flags?.enable_custom_domain_in_emails).to.equal(undefined);

logWarnStub.restore();
});
Expand Down