x

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

@@ -35,7 +35,7 @@ public interface OAuthApi {
 	
 	final String OAUTH_TOKEN_SESSION = "OAUTH2_TOKEN_SESSION_KEY";
 	
-	default boolean isLogin() {
+	default boolean isExistsOAuthToken() {
 		return getOAuthToken() != null;
 	}
 	
@@ -88,9 +88,6 @@ public interface OAuthApi {
 	default void callback()  {
 		try {
 			HttpServletRequest request = this.getHttpServletRequest();
-			HttpSession session = request.getSession();
-			OAuthToken token = (OAuthToken)session.getAttribute(OAUTH_TOKEN_SESSION);
-			if(token == null) {
 			OAuthConfig config = this.getOAuthConfig();
 			OAuthAuthzResponse oauthAuthzResponse = OAuthAuthzResponse.oauthCodeAuthzResponse(request);
 			String code = oauthAuthzResponse.getCode();
@@ -108,11 +105,8 @@ public interface OAuthApi {
 			Long expiresIn = oAuthResponse.getExpiresIn();
 			String idToken = oAuthResponse.getParam("id_token");
 			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"); 
-			}
+			OAuthToken token = new OAuthToken(accessToken, refreshToken, idToken, tokenType, expiresIn);
+			saveOAuthToken(token);
 		} catch (OAuthApiException e) {
 			throw e;
 		} catch (Throwable e) {
@@ -120,6 +114,12 @@ public interface OAuthApi {
 		}
 	}
 	
+	default void saveOAuthToken(OAuthToken token) {
+		HttpServletRequest request = this.getHttpServletRequest();
+		HttpSession session = request.getSession();
+		session.setAttribute(OAUTH_TOKEN_SESSION, token);
+	}
+	
 	default void removeOAuthToken()  {
 		try {
 			HttpServletRequest request = this.getHttpServletRequest();