x

src/main/java/com/egolm/sso/api/OAuthApi.java

@@ -36,7 +36,7 @@ public interface OAuthApi {
 		return token != null;
 	}
 
-	default void sendOAuthLoginRedirect() {
+	default void toLogin() {
 		try {
 			HttpServletResponse response = this.getHttpServletResponse();
 			OAuthConfig config = this.getOAuthConfig();
@@ -51,7 +51,7 @@ public interface OAuthApi {
 		}
 	}
 	
-	default OAuthToken doLogin()  {
+	default void doLogin()  {
 		try {
 			HttpServletRequest request = this.getHttpServletRequest();
 			HttpSession session = request.getSession();
@@ -76,8 +76,9 @@ public interface OAuthApi {
 				String tokenType = oAuthResponse.getTokenType();
 				token = new OAuthToken(accessToken, refreshToken, idToken, tokenType, expiresIn);
 				session.setAttribute(OAUTH_TOKEN_SESSION, token);
+			} else {
+				throw new OAuthApiException("OAuthToken already exists"); 
 			}
-			return token;
 		} catch (Exception e) {
 			throw new OAuthApiException(e.getMessage(), e);
 		}
@@ -90,7 +91,7 @@ public interface OAuthApi {
 		session.invalidate();
 	}
 	
-	default OAuthToken refresh() {
+	default void refresh() {
 		try {
 			HttpServletRequest request = this.getHttpServletRequest();
 			HttpSession session = request.getSession();
@@ -111,7 +112,6 @@ public interface OAuthApi {
 			String tokenType = oAuthResponse.getTokenType();
 			OAuthToken newToken = new OAuthToken(accessToken, refreshToken, idToken, tokenType, expiresIn);
 			session.setAttribute(OAUTH_TOKEN_SESSION, newToken);
-			return newToken;
 		} catch (Exception e) {
 			throw new OAuthApiException(e.getMessage(), e);
 		}