Refactor

src/main/java/net/geant/nmaas/portal/api/auth/OIDCAuthController.java

@@ -41,29 +41,20 @@ import static java.lang.String.format;
 public class OIDCAuthController {
 
     private final OidcUserService oidcUserService;
-
     private final JWTTokenService jwtTokenService;
-
     private final UserLoginRegisterService loginRegisterService;
-
     private final UserService userService;
-
     private final PasswordEncoder passwordEncoder;
-
     private final DomainService domains;
-
     private final ConfigurationManager configurationManager;
 
-
     @Value("${portal.address}")
     private String portalAddress;
     @Value("${spring.security.oauth2.client.provider.my-oidc.issuer-uri:http://localhost:8080/realms/geant}")
     private String oidcAddress;
 
-
     @PostMapping("api/oidc/link")
     public UserOidcToken oidcLinkedSuccess(@RequestBody final OidcLogin oidcLogin, HttpServletRequest request) {
-
         User user = userService.findByEmail(oidcLogin.email());
         try {
             validate(
@@ -81,14 +72,12 @@ public class OIDCAuthController {
             throw new AuthenticationException(ae.getMessage());
         }
         checkUserApprovals(user);
-        if (
-                configurationManager.getConfiguration().isMaintenance()
-                        && user.getRoles().stream().noneMatch(
-                        value -> value.getRole().equals(Role.ROLE_SYSTEM_ADMIN)
-                )
-        ) {
+
+        if (configurationManager.getConfiguration().isMaintenance()
+                && user.getRoles().stream().noneMatch(value -> value.getRole().equals(Role.ROLE_SYSTEM_ADMIN))) {
             throw new UndergoingMaintenanceException("Application is undergoing maintenance right now");
         }
+
         this.loginRegisterService.registerNewSuccessfulLogin(
                 user,
                 request.getHeader(HttpHeaders.HOST),
@@ -108,13 +97,10 @@ public class OIDCAuthController {
                 jwtTokenService.getRefreshToken(linkedUser),
                 oidcLogin.oidcToken()
         );
-
-
     }
 
     @GetMapping("/api/oidc/success")
     public RedirectView oidcLoginSuccess(@AuthenticationPrincipal OidcUser oidcUser, HttpServletRequest request) {
-
         if (oidcUserService.externalUserRequiredLinking(oidcUser)) {
             String linkingRedirectUrl = portalAddress
                     + "/login-linking?oidc_token="
@@ -122,7 +108,6 @@ public class OIDCAuthController {
             return new RedirectView(linkingRedirectUrl);
         }
 
-
         try {
             User user = oidcUserService.checkUser(oidcUser);
             String redirectUrl = portalAddress
@@ -152,13 +137,10 @@ public class OIDCAuthController {
 
     @GetMapping("/api/oidc/logout/{oidcToken}")
     public RedirectView logout(@PathVariable String oidcToken) {
-
         String logoutUrl = oidcAddress + "/protocol/openid-connect/logout";
         return new RedirectView(logoutUrl + "?id_token_hint=" + oidcToken);
-
     }
 
-
     void validate(String email, String providedPassword, String actualPassword, boolean isEnabled) {
         validateConditionAndLogMessage(email == null || providedPassword == null,
                 format("Login failed: missing credentials%s", email != null ? (format(" (email: %s)", email)) : ""));
@@ -168,7 +150,7 @@ public class OIDCAuthController {
 
     void checkUserApprovals(User user) {
         if (!user.isTermsOfUseAccepted() || !user.isPrivacyPolicyAccepted()) {
-            log.info(format("Check during login: Terms of Use or Privacy Policy were not accepted by user [%s]", user.getUsername()));
+            log.info("Check during login: Terms of Use or Privacy Policy were not accepted by user [{}]", user.getUsername());
             user.setNewRoles(ImmutableSet.of(new UserRole(user, domains.getGlobalDomain().orElseThrow(SignupException::new), Role.ROLE_NOT_ACCEPTED)));
         }
     }

src/main/java/net/geant/nmaas/portal/service/OidcUserService.java

@@ -7,9 +7,13 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 public interface OidcUserService {
 
     User checkUser(OidcUser oidcUser);
+
     User register(OidcUser user, Domain globalDomain);
+
     User registerNewUser(OidcUser oidcUser);
+
     boolean externalUserRequiredLinking(OidcUser oidcUser);
+
     User linkUser(String email, String samlToken, String firstName, String lastName);
 
 }

src/main/java/net/geant/nmaas/portal/service/impl/OidcUserServiceImpl.java

@@ -58,8 +58,7 @@ public class OidcUserServiceImpl implements OidcUserService {
             return userService
                     .findBySamlToken(oidcUserSub)
                     .orElseThrow();
-        } else if (existUserByUsernameAsSamlToken
-                || existsUserBySamlTokenAsEmail) {
+        } else if (existUserByUsernameAsSamlToken || existsUserBySamlTokenAsEmail) {
             User user = userService
                     .findBySamlToken(oidcUserPreferredUsername)
                     .orElseThrow();
@@ -80,9 +79,7 @@ public class OidcUserServiceImpl implements OidcUserService {
     @Override
     public User registerNewUser(OidcUser oidcUser) {
         try {
-            return register(oidcUser,
-                    domains.getGlobalDomain().orElseThrow(MissingElementException::new)
-            );
+            return register(oidcUser, domains.getGlobalDomain().orElseThrow(MissingElementException::new));
         } catch (ObjectAlreadyExistsException e) {
             throw new SignupException("User already exists");
         } catch (MissingElementException e) {
@@ -93,7 +90,6 @@ public class OidcUserServiceImpl implements OidcUserService {
     @Override
     public User register(OidcUser oidcUser, Domain globalDomain) {
 
-        Map<String, Object> attributes = oidcUser.getAttributes();
         byte[] array = new byte[16];
         new SecureRandom().nextBytes(array);
         String generatedString = Base64.getEncoder().encodeToString(array);
@@ -119,10 +115,11 @@ public class OidcUserServiceImpl implements OidcUserService {
 
         String oidcUserEmail = oidcUser.getAttribute("email");
 
-        if(userService.existsByEmail(oidcUserEmail)){
-            User user = userService.findByEmail(oidcUserEmail);
+        if (userService.existsByEmail(oidcUserEmail)) {
+            final User user = userService.findByEmail(oidcUserEmail);
             return user.getSamlToken() == null || user.getSamlToken().isEmpty();
         }
+
         return false;
     }
 
@@ -138,5 +135,4 @@ public class OidcUserServiceImpl implements OidcUserService {
         return user;
     }
 
-
 }