-
Committer:
Ubuntu One Auto Copilot
-
Author(s):
Daniel Manrique
-
Date:
2020-03-03 20:11:37 UTC
-
mfrom:
(1725.1.5 dont-override-preferred-email)
-
Revision ID:
otto-copilot@canonical.com-20200303201137-61zqamibb8ihhklt
Add "dont_override_preferred" setting for SAMLConfigs.
If unset, always send a long-form first.last.canonical.com if the SP is
configured as "prefer Canonical email" and such an e-mail is present.
If set, for SPs configured as "Prefer Canonical email", if the preferred
address is already @canonical.com or @ubuntu.com, do not override it and send
the preferred one as-is.
SPs not configured as "prefer Canonical email" are unchanged.
https://bugs.launchpad.net/canonical-identity-provider/+bug/1865070
Merged from https://code.launchpad.net/~roadmr/canonical-identity-provider/dont-override-preferred-email/+merge/380056