Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

Merge commit 'refs/changes/90/6690/4' of ssh://gerrit.tuleap.net:29418/tuleap into stable

Download Browse

* ssh://gerrit.tuleap.net:29418/tuleap: request #9333: Fatal error when I try to link two different accounts from the same provider

+156 −42
Nicolas Terray (nterray) 2016-11-09 08:43
Nicolas Terray (nterray) 2016-11-09 08:43
c9ad00478d575ab98e3c9d5a09b8c18fc05e74a8
git #tuleap/stable/c9ad00478d575ab98e3c9d5a09b8c18fc05e74a8

Modified Files

Side by side diff
Inline diff
Name
M plugins/openidconnectclient/db/install.sql +3 −1 Go to diff View file
A plugins/openidconnectclient/db/mysql/2016/201610141445_allow_to_login_with_multiple_accounts_on_the_same_provider.php +57 −0 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/Router.php +1 −1 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/Controller.php +14 −6 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMapping.php +17 −5 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingDao.class.php +18 −10 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingManager.php +27 −8 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserMappingUsage.php +14 −6 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/UserMapping/UserPreferencesPresenter.php +4 −4 Go to diff View file
M plugins/openidconnectclient/templates/user_preference.mustache +1 −1 Go to diff View file