Merge branch 'main' into feature/add-altia-logos

# Conflicts:
#	CHANGELOG.md
#	build.gradle
#	src/main/resources/templates/login-en.html

Author: rogermiretin2

CHANGELOG.md

@@ -4,13 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.0.1](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.1)
+## [v2.0.5](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.5)
 ### Added
 - Add Altia logo and favicon.
 
 ### Changed
 - Make login QR padding white.
 
+## [v2.0.4](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.4)
+### Removed
+- Remove hardcoded visible "DOME" references in UI.
+
+## [v2.0.3](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.3)
+### Changed
+- For frontend pages, set language from Accept-Language header before using default language.
+
+## [v2.0.2](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.2)
+### Added
+- Get default language from configuration, use it to translate HTML templates.
+
+## [v2.0.1](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.1)
+- ### Added
+- Implement Authorization Code Flow with PKCE
+
 ## [v2.0.0](https://github.com/in2workspace/in2-verifier-api/releases/tag/v2.0.0)
 - New major version to align with the new major version of EUDIStack project.
 

build.gradle

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = 'es.in2'
-version = '2.0.1'
+version = '2.0.5'
 
 java {
 	toolchain {

src/main/java/es/in2/vcverifier/config/FrontendConfig.java

@@ -46,6 +46,8 @@ public String getFaviconSrc() {
         return defaultIfBlank(properties.faviconSrc(), "dome_logo_favicon.png");
     }
 
+    public String getDefaultLang() { return defaultIfBlank(properties.defaultLang(), "en"); }
+
     private String defaultIfBlank(String value, String defaultValue) {
         return (value == null || value.trim().isEmpty()) ? defaultValue : value;
     }

src/main/java/es/in2/vcverifier/config/I18nConfig.java

@@ -0,0 +1,26 @@
+package es.in2.vcverifier.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
+
+import java.util.List;
+import java.util.Locale;
+import org.springframework.web.servlet.LocaleResolver;
+
+@Configuration
+public class I18nConfig implements WebMvcConfigurer {
+    @Bean
+    public LocaleResolver localeResolver(FrontendConfig frontendConfig) {
+        AcceptHeaderLocaleResolver r = new AcceptHeaderLocaleResolver();
+        r.setSupportedLocales(List.of(
+                Locale.forLanguageTag("en"),
+                Locale.forLanguageTag("es"),
+                Locale.forLanguageTag("ca")
+        ));
+
+        r.setDefaultLocale(Locale.forLanguageTag(frontendConfig.getDefaultLang()));
+        return r;
+    }
+}

src/main/java/es/in2/vcverifier/config/properties/FrontendProperties.java

@@ -13,7 +13,8 @@ public record FrontendProperties(
         @NotNull @NestedConfigurationProperty Urls urls,
         @NestedConfigurationProperty Colors colors,
         @NotBlank String logoSrc,
-        String faviconSrc) {
+        String faviconSrc,
+        String defaultLang) {
 
     public record Urls(
             @NotBlank @URL String onboarding,

src/main/java/es/in2/vcverifier/controller/ClientErrorController.java

@@ -9,6 +9,9 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.ui.Model;
 
+import java.util.Locale;
+
+
 @Controller
 @RequiredArgsConstructor
 public class ClientErrorController {
@@ -21,6 +24,7 @@ public String showErrorPage(@RequestParam("errorCode") String errorCode,
                                 @RequestParam("errorMessage") String errorMessage,
                                 @RequestParam("clientUrl") String clientUrl,
                                 @RequestParam("originalRequestURL") String originalRequestURL,
+                                Locale locale,
                                 Model model) {
         // Add attributes to the model
         model.addAttribute("errorCode", errorCode);
@@ -34,8 +38,10 @@ public String showErrorPage(@RequestParam("errorCode") String errorCode,
         model.addAttribute("secondary", frontendConfig.getSecondaryColor());
         model.addAttribute("secondaryContrast", frontendConfig.getSecondaryContrastColor());
         model.addAttribute("faviconSrc", frontendConfig.getFaviconSrc());
+
         // Return the view name
-        return "client-authentication-error";
+        String language = locale.getLanguage().toLowerCase();
+        return "client-authentication-error-" + language;
     }
 
 }

src/main/java/es/in2/vcverifier/controller/LoginQrController.java

@@ -16,6 +16,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.util.Base64;
+import java.util.Locale;
 
 @Controller
 @RequiredArgsConstructor
@@ -25,7 +26,7 @@ public class LoginQrController {
 
     @GetMapping("/login")
     @ResponseStatus(HttpStatus.OK)
-    public String showQrLogin(@RequestParam("authRequest") String authRequest, @RequestParam("state") String state, Model model, @RequestParam("homeUri") String homeUri) {
+    public String showQrLogin(@RequestParam("authRequest") String authRequest, @RequestParam("state") String state, Model model, Locale locale,  @RequestParam("homeUri") String homeUri) {
         try {
             // Generar la imagen QR en base64
             String qrImageBase64 = generateQRCodeImageBase64(authRequest);
@@ -46,10 +47,12 @@ public String showQrLogin(@RequestParam("authRequest") String authRequest, @Requ
             model.addAttribute("faviconSrc", frontendConfig.getFaviconSrc());
             model.addAttribute("expiration", LOGIN_TIMEOUT);
             model.addAttribute("cronUnit", LOGIN_TIMEOUT_CHRONO_UNIT);
+
         } catch (Exception e) {
             throw new QRCodeGenerationException(e.getMessage());
         }
-        return "login";
+        String language = locale.getLanguage().toLowerCase();
+        return "login-" + language;
     }
 
     private String generateQRCodeImageBase64(String barcodeText) {

src/main/java/es/in2/vcverifier/model/AuthorizationContext.java

@@ -9,6 +9,8 @@ public record AuthorizationContext(
         String redirectUri,
         String clientNonce,
         String originalRequestURL,
-        String requestUri
+        String requestUri,
+        String codeChallenge,
+        String codeChallengeMethod
 ) {
 }

src/main/java/es/in2/vcverifier/security/AuthorizationServerConfig.java

@@ -83,7 +83,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
                 )
                 .tokenEndpoint(tokenEndpoint ->
                         tokenEndpoint
-                                .accessTokenRequestConverter(new CustomTokenRequestConverter(jwtService, clientAssertionValidationService, vpService, cacheStoreForAuthorizationCodeData,oAuth2AuthorizationService(),objectMapper, refreshTokenDataCacheCacheStore))
+                                .accessTokenRequestConverter(new CustomTokenRequestConverter(jwtService, clientAssertionValidationService, vpService, cacheStoreForAuthorizationCodeData,objectMapper, refreshTokenDataCacheCacheStore))
                                 .authenticationProvider(new CustomAuthenticationProvider(jwtService,registeredClientRepository,backendConfig,objectMapper, refreshTokenDataCacheCacheStore, oAuth2AuthorizationService()))
                 )
                 .oidc(Customizer.withDefaults());    // Enable OpenID Connect 1.0