From 4bd91b6d4b18d0b469726e3eebe1d8c61d75b8cc Mon Sep 17 00:00:00 2001
From: flytreeleft <flytreeleft@126.com>
Date: Mon, 9 Nov 2020 20:28:25 +0800
Subject: [PATCH] Clean code

---
 .../plugin/internal/NexusKeycloakClient.java  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/github/flytreeleft/nexus3/keycloak/plugin/internal/NexusKeycloakClient.java b/src/main/java/org/github/flytreeleft/nexus3/keycloak/plugin/internal/NexusKeycloakClient.java
index d1b9757..b3c86e9 100644
--- a/src/main/java/org/github/flytreeleft/nexus3/keycloak/plugin/internal/NexusKeycloakClient.java
+++ b/src/main/java/org/github/flytreeleft/nexus3/keycloak/plugin/internal/NexusKeycloakClient.java
@@ -66,26 +66,23 @@ public boolean authenticate(UsernamePasswordToken token) {
     public boolean authenticate(KeycloakHttpHeaderAuthToken token) {
         String principal = token.getPrincipal();
         String credentials = token.getCredentials().toString();
-        boolean authenticated = false;
 
         UserInfo userInfo = this.keycloakAdminClient.obtainUserInfo(credentials);
         if (userInfo == null) {
             return false;
         }
-        authenticated = userInfo.getPreferredUsername().equals(principal);
-        this.logger.info("principal is {} while pun is {}, so auth result is {}",
-                             principal,
-                             userInfo.getPreferredUsername(),
-                             authenticated);
-
-        if (authenticated) {
-            return authenticated;
+
+        if (userInfo.getPreferredUsername().equals(principal)) {
+            return true;
         }
-        boolean isEmail = this.keycloakAdminClient.isEmail(principal);
-        if (isEmail) {
+        logger.info("The principal {} doesn't match the preferred username, try to verify it as an email", principal);
+
+        if (this.keycloakAdminClient.isEmail(principal)) {
             return userInfo.getEmailVerified() && principal.equals(userInfo.getEmail());
         }
-        return authenticated;
+        logger.info("The principal {} isn't an email, authentication is failed", principal);
+
+        return false;
     }
 
     public Set<String> findRoleIdsByUserId(String userId) {