aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-plugin-api
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-01-25 16:23:06 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-01-27 14:49:51 +0100
commit3219b99f2e675e9d14dd06ae68f4e005426f15b5 (patch)
treef031f3614080e680436beae02c3bf279209fce53 /sonar-plugin-api
parent6c1bb2ac26ac3d13c607507c66a0769ba6155d46 (diff)
downloadsonarqube-3219b99f2e675e9d14dd06ae68f4e005426f15b5.tar.gz
sonarqube-3219b99f2e675e9d14dd06ae68f4e005426f15b5.zip
SONAR-7217 Fail to authenticate user with existing email
Diffstat (limited to 'sonar-plugin-api')
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java6
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java3
2 files changed, 7 insertions, 2 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java
index 6f17ee506fd..1d5c2ce47c6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java
@@ -59,7 +59,11 @@ public interface BaseIdentityProvider extends IdentityProvider {
* The first time a user is authenticated (and if {@link #allowsUsersToSignUp()} is true), a new user will be registered.
* Then, only user's name and email are updated.
*
- * @throws NotAllowUserToSignUpException when {@link #allowsUsersToSignUp()} is false and a new user try to authenticate
+ * If @link #allowsUsersToSignUp()} is set to false and a new user try to authenticate,
+ * then the user is not authenticated and he's redirected to a dedicated page.
+ *
+ * If the email of the user is already used by an existing user of the platform,
+ * then the user is not authenticated and he's redirected to a dedicated page.
*/
void authenticate(UserIdentity userIdentity);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java
index 4409803ac10..b453e0b846f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java
@@ -87,7 +87,8 @@ public interface OAuth2IdentityProvider extends IdentityProvider {
void redirectToRequestedPage();
/**
- * Authenticate and register the user into the platform
+ * Authenticate and register the user into the platform.
+ * @see org.sonar.api.server.authentication.BaseIdentityProvider.Context#authenticate(UserIdentity)
*/
void authenticate(UserIdentity userIdentity);
}