diff --git a/docker-compose.yml b/docker-compose.yml index 85dd77e4..3ab846f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -396,7 +396,7 @@ services: networks: obref: healthcheck: - test: ["CMD", "curl", "-f", "-k", "https://localhost:8066/actuator/health"] + test: ["CMD", "curl", "-f", "-k", "https://localhost:8100/actuator/health"] interval: 1m30s timeout: 10s retries: 3 diff --git a/forgerock-openbanking-backstage/forgerock-openbanking-monitoring/src/main/java/com/forgerock/openbanking/monitoring/configuration/HomeController.java b/forgerock-openbanking-backstage/forgerock-openbanking-monitoring/src/main/java/com/forgerock/openbanking/monitoring/configuration/HomeController.java deleted file mode 100755 index e6c8534c..00000000 --- a/forgerock-openbanking-backstage/forgerock-openbanking-monitoring/src/main/java/com/forgerock/openbanking/monitoring/configuration/HomeController.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright 2019 ForgeRock AS. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.forgerock.openbanking.monitoring.configuration; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * Home redirection to swagger api documentation - */ -@Controller -public class HomeController { - @RequestMapping(value = "/open-banking/") - public String index() { - return "redirect:swagger-ui.html"; - } -} diff --git a/forgerock-openbanking-config/forgerock-openbanking-git-config/devportal/register/register.yml b/forgerock-openbanking-config/forgerock-openbanking-git-config/devportal/register/register.yml index febc0bd5..1416f4d4 100644 --- a/forgerock-openbanking-config/forgerock-openbanking-git-config/devportal/register/register.yml +++ b/forgerock-openbanking-config/forgerock-openbanking-git-config/devportal/register/register.yml @@ -44,3 +44,4 @@ session: manual-onboarding: aspspManualOnboardingEndpoint: https://matls.as.aspsp.${dns.hosts.root}/open-banking/manual-onboarding/registerApplication/ + registration-request-base: classpath:registrationrequest.json diff --git a/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/java/com/forgerock/openbanking/register/RegisterApplicationSecurityConfiguration.java b/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/java/com/forgerock/openbanking/register/RegisterApplicationSecurityConfiguration.java index 35182be9..8e6eee15 100644 --- a/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/java/com/forgerock/openbanking/register/RegisterApplicationSecurityConfiguration.java +++ b/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/java/com/forgerock/openbanking/register/RegisterApplicationSecurityConfiguration.java @@ -26,14 +26,14 @@ import com.forgerock.openbanking.jwt.services.CryptoApiClient; import com.forgerock.openbanking.model.OBRIRole; import com.forgerock.openbanking.ssl.services.keystore.KeyStoreService; -import com.google.common.collect.Sets; -import com.nimbusds.jose.JOSEException; -import com.nimbusds.jwt.JWT; import com.forgerock.spring.security.multiauth.configurers.MultiAuthenticationCollectorConfigurer; import com.forgerock.spring.security.multiauth.configurers.collectors.CustomJwtCookieCollector; import com.forgerock.spring.security.multiauth.configurers.collectors.PSD2Collector; import com.forgerock.spring.security.multiauth.configurers.collectors.StaticUserCollector; import com.forgerock.spring.security.multiauth.model.CertificateHeaderFormat; +import com.google.common.collect.Sets; +import com.nimbusds.jose.JOSEException; +import com.nimbusds.jwt.JWT; import lombok.Builder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/resources/unfiltered/registrationrequest.json b/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/resources/unfiltered/registrationrequest.json new file mode 100644 index 00000000..70386857 --- /dev/null +++ b/forgerock-openbanking-devportal/forgerock-openbanking-register/src/main/resources/unfiltered/registrationrequest.json @@ -0,0 +1,8 @@ +{ + "scope": "openid accounts payments fundsconfirmations", + "grant_types": ["authorization_code", "client_credentials"], + "response_types": ["code id_token"], + "token_endpoint_auth_method": "client_secret_basic", + "id_token_signed_response_alg": "PS256", + "subject_type": "pairwise" +} diff --git a/pom.xml b/pom.xml index aeea5841..f35ae14c 100644 --- a/pom.xml +++ b/pom.xml @@ -44,14 +44,14 @@ http://www.forgerock.com - 1.3.3 - 1.3.2 - 1.3.2 - 1.3.2 - 1.6.2 - 1.4.2 - 1.7.1 - 1.7.1 + 1.3.4 + 1.3.3 + 1.3.3 + 1.3.4 + 1.6.3 + 1.4.3 + 1.7.3 + 1.7.2