fix: ciba device notifier header ui and EL support

gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-api/pom.xml

@@ -43,7 +43,25 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.gravitee.am.repository</groupId>
+            <artifactId>gravitee-am-repository-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.gravitee.el</groupId>
+            <artifactId>gravitee-expression-language</artifactId>
+            <version>${gravitee-expression-language.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.gravitee.am.gateway.handler</groupId>
+            <artifactId>gravitee-am-gateway-handler-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 
-</project>
+</project>

gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-api/src/main/java/io/gravitee/am/authdevice/notifier/api/model/ADNotificationRequest.java

@@ -15,19 +15,31 @@
  */
 package io.gravitee.am.authdevice.notifier.api.model;
 
+import io.gravitee.am.gateway.handler.common.vertx.core.http.VertxHttpServerRequest;
+import io.gravitee.am.gateway.handler.context.EvaluableExecutionContext;
+import io.gravitee.am.gateway.handler.context.EvaluableRequest;
+import io.gravitee.el.TemplateContext;
+import io.gravitee.el.TemplateEngine;
+import io.vertx.rxjava3.ext.web.RoutingContext;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
 import java.util.Set;
 
+import static io.gravitee.am.gateway.handler.common.utils.RoutingContextUtils.getEvaluableAttributes;
+
 /**
  * @author Eric LELEU (eric.leleu at graviteesource.com)
  * @author GraviteeSource Team
  */
 @Setter
 @Getter
 public class ADNotificationRequest {
+
+    private static final String TEMPLATE_ATTRIBUTE_REQUEST = "request";
+    private static final String TEMPLATE_ATTRIBUTE_CONTEXT = "context";
+
     private String deviceNotifierId;
     private String transactionId;
     private String subject;
@@ -36,4 +48,17 @@ public class ADNotificationRequest {
     private List<String> acrValues;
     private String state;
     private String message;
+    private RoutingContext context;
+
+    private TemplateEngine templateEngine;
+
+    public TemplateEngine getTemplateEngine() {
+        if (templateEngine == null) {
+            templateEngine = TemplateEngine.templateEngine();
+            TemplateContext templateContext = templateEngine.getTemplateContext();
+            templateContext.setVariable(TEMPLATE_ATTRIBUTE_REQUEST, new EvaluableRequest(new VertxHttpServerRequest(this.context.request().getDelegate())));
+            templateContext.setVariable(TEMPLATE_ATTRIBUTE_CONTEXT, new EvaluableExecutionContext(getEvaluableAttributes(this.context)));
+        }
+        return templateEngine;
+    }
 }

gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-http/src/main/java/io/gravitee/am/authdevice/notifier/http/provider/HttpAuthenticationDeviceNotifierProvider.java

@@ -24,6 +24,7 @@
 import io.gravitee.am.authdevice.notifier.http.HttpAuthenticationDeviceNotifierConfiguration;
 import io.gravitee.am.authdevice.notifier.http.provider.spring.HttpAuthenticationDeviceProviderSpringConfiguration;
 import io.gravitee.common.http.HttpStatusCode;
+import io.gravitee.el.exceptions.ExpressionEvaluationException;
 import io.reactivex.rxjava3.core.Single;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
@@ -69,16 +70,24 @@ public class HttpAuthenticationDeviceNotifierProvider implements AuthenticationD
 
     @Override
     public Single<ADNotificationResponse> notify(ADNotificationRequest request) {
+
         LOGGER.debug("Call notifier service '{}' (tid: {}) ", this.configuration.getEndpoint(), request.getTransactionId());
 
         MultiMap formData = prepareFormData(request);
 
         final HttpRequest<Buffer> notificationRequest = this.client.requestAbs(HttpMethod.POST, this.configuration.getEndpoint());
         if (this.configuration.getHttpHeaders() != null && !this.configuration.getHttpHeaders().isEmpty()) {
-            notificationRequest.putHeaders(this.configuration.getHttpHeaders().stream()
-                    .collect(MultiMap::caseInsensitiveMultiMap,
-                            (map, header) -> map.add(header.getName(), header.getValue()),
-                            MultiMap::addAll));
+            MultiMap headers = MultiMap.caseInsensitiveMultiMap();
+            for (var header : this.configuration.getHttpHeaders()) {
+                try {
+                    String value = request.getTemplateEngine().eval(header.getValue(), String.class).blockingGet();
+                    headers.add(header.getName(), value);
+                } catch (ExpressionEvaluationException e) {
+                    LOGGER.error("Failed to evaluate header '{}'", header.getName(), e);
+                    return Single.error(new DeviceNotificationException("Failed to evaluate header"));
+                }
+            }
+            notificationRequest.putHeaders(headers);
         }
         if (hasText(this.configuration.getHeaderValue())) {
             notificationRequest

gravitee-am-authdevice-notifier/gravitee-am-authdevice-notifier-http/src/main/resources/schemas/schema-form.json

@@ -54,7 +54,7 @@
                     },
                     "value": {
                         "title": "Value",
-                        "description": "HTTP Header value",
+                        "description": "HTTP Header value (support EL)",
                         "type": "string"
                     }
                 },

gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-oidc/pom.xml

@@ -61,6 +61,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.gravitee.am.authdevice.notifier</groupId>
+            <artifactId>gravitee-am-authdevice-notifier-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Testing -->
         <dependency>

gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-oidc/src/main/java/io/gravitee/am/gateway/handler/ciba/ad/AuthenticationDeviceNotifier.java

@@ -15,8 +15,8 @@
  */
 package io.gravitee.am.gateway.handler.ciba.ad;
 
-import io.gravitee.am.gateway.handler.ciba.ad.model.ADNotificationRequest;
-import io.gravitee.am.gateway.handler.ciba.ad.model.ADNotificationResponse;
+import io.gravitee.am.authdevice.notifier.api.model.ADNotificationRequest;
+import io.gravitee.am.authdevice.notifier.api.model.ADNotificationResponse;
 import io.reactivex.rxjava3.core.Single;
 
 /**

gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-oidc/src/main/java/io/gravitee/am/gateway/handler/ciba/ad/impl/AuthenticationDeviceNotifierImpl.java

@@ -15,9 +15,9 @@
  */
 package io.gravitee.am.gateway.handler.ciba.ad.impl;
 
+import io.gravitee.am.authdevice.notifier.api.model.ADNotificationRequest;
+import io.gravitee.am.authdevice.notifier.api.model.ADNotificationResponse;
 import io.gravitee.am.gateway.handler.ciba.ad.AuthenticationDeviceNotifier;
-import io.gravitee.am.gateway.handler.ciba.ad.model.ADNotificationRequest;
-import io.gravitee.am.gateway.handler.ciba.ad.model.ADNotificationResponse;
 import io.gravitee.am.gateway.handler.ciba.exception.DeviceNotificationException;
 import io.gravitee.am.model.Domain;
 import io.gravitee.am.service.http.WebClientBuilder;
@@ -103,7 +103,7 @@ public Single<ADNotificationResponse> notify(ADNotificationRequest request) {
 
                     final JsonObject result = response.bodyAsJsonObject();
                     if ( !request.getTransactionId().equals(result.getString(TRANSACTION_ID)) || !request.getState().equals(result.getString(STATE))) {
-                        LOGGER.warn("Device notification response contains invalid tid or state", request.getTransactionId(), response.statusCode());
+                        LOGGER.warn("Device notification response contains invalid tid '{}' or state '{}'", request.getTransactionId(), request.getState());
                         throw new DeviceNotificationException("Invalid device notification response");
                     }
 

gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-oidc/src/main/java/io/gravitee/am/gateway/handler/ciba/resources/handler/AuthenticationRequestAcknowledgeHandler.java

@@ -113,6 +113,7 @@ public void handle(RoutingContext context) {
                                         adRequest.setState(stateJwt);
                                         adRequest.setTransactionId(externalTrxId);
                                         adRequest.setDeviceNotifierId(authDeviceNotifierId);
+                                        adRequest.setContext(context);
 
                                         return authRequestService.notify(adRequest)
                                                 .flatMap(adResponse -> {

gravitee-am-ui/src/app/domain/settings/openid/ciba/device-notifiers/device-notifier/form/form.component.scss

@@ -5,3 +5,16 @@
 :host ::ng-deep mat-error {
   padding-left: 12px;
 }
+
+:host {
+  ::ng-deep {
+    fieldset {
+      flex-layout-root-widget {
+        display: initial !important;
+        max-height: 100% !important;
+        box-sizing: border-box !important;
+        flex-flow: column nowrap !important;
+      }
+    }
+  }
+}