Updated version to 1.7.1 and added initial changelog

build.gradle

@@ -13,7 +13,7 @@ repositories {
     mavenCentral()
 }
 
-version = '1.7.0'
+version = '1.7.1'
 group = 'net.geant.nmaas'
 
 java {
@@ -34,7 +34,7 @@ protobuf {
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.69.1'
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.71.0'
         }
     }
     generateProtoTasks {
@@ -133,9 +133,9 @@ dependencies {
     implementation('io.fabric8:kubernetes-client:6.13.5')
 
     implementation('com.google.protobuf:protobuf-java:4.29.3')
-    implementation('io.grpc:grpc-netty-shaded:1.69.1')
-    implementation('io.grpc:grpc-protobuf:1.69.1')
-    implementation('io.grpc:grpc-stub:1.69.1')
+    implementation('io.grpc:grpc-netty-shaded:1.71.0')
+    implementation('io.grpc:grpc-protobuf:1.71.0')
+    implementation('io.grpc:grpc-stub:1.71.0')
 
     implementation('com.opencsv:opencsv:5.9')
 

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

@@ -101,7 +101,7 @@ public class OIDCAuthController {
 
     @GetMapping("/api/oidc/success")
     public RedirectView oidcLoginSuccess(@AuthenticationPrincipal OidcUser oidcUser, HttpServletRequest request) {
-        if (oidcUserService.externalUserRequiredLinking(oidcUser)) {
+        if (oidcUserService.externalUserRequiresLinking(oidcUser)) {
             String linkingRedirectUrl = portalAddress
                     + "/login-linking?oidc_token="
                     + oidcUser.getIdToken().getTokenValue();

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

@@ -12,7 +12,7 @@ public interface OidcUserService {
 
     User registerNewUser(OidcUser oidcUser);
 
-    boolean externalUserRequiredLinking(OidcUser oidcUser);
+    boolean externalUserRequiresLinking(OidcUser oidcUser);
 
     User linkUser(String email, String samlToken, String firstName, String lastName);
 

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

@@ -4,8 +4,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.geant.nmaas.portal.api.exception.MissingElementException;
 import net.geant.nmaas.portal.api.exception.SignupException;
-import net.geant.nmaas.portal.api.exception.ExternalUserCanNotBeLinked;
-import net.geant.nmaas.portal.api.exception.ExternalUserMatchException;
 import net.geant.nmaas.portal.exceptions.ObjectAlreadyExistsException;
 import net.geant.nmaas.portal.persistent.entity.Domain;
 import net.geant.nmaas.portal.persistent.entity.Role;
@@ -21,7 +19,6 @@ import org.springframework.stereotype.Service;
 
 import java.security.SecureRandom;
 import java.util.Base64;
-import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -29,17 +26,13 @@ import java.util.Map;
 public class OidcUserServiceImpl implements OidcUserService {
 
     private final UserService userService;
-
     private final DomainService domains;
-
     private final UserRepository userRepository;
-
     private final ConfigurationManager configurationManager;
 
     @Value("${oidc.allowedLinkingUsersByEmail:false}")
     private boolean allowedLinkingUsersByEmail;
 
-
     @Override
     public User checkUser(OidcUser oidcUser) {
 
@@ -55,14 +48,14 @@ public class OidcUserServiceImpl implements OidcUserService {
                     .findBySamlToken(oidcUserSub)
                     .orElseThrow();
         }
-        if(userService.existsByEmail(oidcUserEmail)) {
+        if (userService.existsByEmail(oidcUserEmail)) {
             User user = userService.findByEmail(oidcUserEmail);
             if (user.getSamlToken().equals(oidcUserEmail)
                     || user.getSamlToken().equals(oidcUserPreferredUsername)) {
                 user.setSamlToken(oidcUserSub);
                 userService.update(user);
                 return user;
-                }
+            }
         }
         return registerNewUser(oidcUser);
 
@@ -103,7 +96,7 @@ public class OidcUserServiceImpl implements OidcUserService {
     }
 
     @Override
-    public boolean externalUserRequiredLinking(OidcUser oidcUser) {
+    public boolean externalUserRequiresLinking(OidcUser oidcUser) {
 
         String oidcUserEmail = oidcUser.getAttribute("email");
 

src/main/resources/changelog.json

 {
   "versions" : [
+    {
+      "verNo" : "1.7.1",
+      "date" : "(2025/04/10)",
+      "topic" : [
+        {
+          "title" : "Authentication and user access improvements",
+          "tags" : "[Enhancement]",
+          "description" : "JWT size reduction and account linking mechanism"
+        }
+      ]
+    },
     {
       "verNo" : "1.7.0",
       "date" : "(2025/04/02)",

src/test/java/net/geant/nmaas/portal/api/auth/OIDCAuthControllerTest.java

@@ -114,7 +114,7 @@ class OIDCAuthControllerTest {
         when(idToken.getTokenValue()).thenReturn("oidc-token");
         when(oidcUser.getIdToken()).thenReturn(idToken);
 
-        when(oidcUserService.externalUserRequiredLinking(any())).thenReturn(false);
+        when(oidcUserService.externalUserRequiresLinking(any())).thenReturn(false);
 
         Constructor<User> userConstructor = User.class.getDeclaredConstructor();
         userConstructor.setAccessible(true);
@@ -147,7 +147,7 @@ class OIDCAuthControllerTest {
         when(idToken.getTokenValue()).thenReturn("oidc-token");
         when(oidcUser.getIdToken()).thenReturn(idToken);
 
-        when(oidcUserService.externalUserRequiredLinking(any())).thenReturn(true);
+        when(oidcUserService.externalUserRequiresLinking(any())).thenReturn(true);
 
         // when
         RedirectView result = oidcAuthController.oidcLoginSuccess(oidcUser, request);