From a38af247cf53f5a3b62775986f33a5cbedca52ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 8 Jun 2021 14:30:26 +0200 Subject: [PATCH] feature/Identitiy Proivider; Tweak usage of the bank specific logo from an OBP-API instance --- .../openbankproject/oauth2/controller/ConsentController.java | 5 +++++ .../openbankproject/oauth2/controller/LoginController.java | 3 +++ src/main/resources/application.properties | 3 ++- src/main/resources/templates/accounts.html | 2 +- src/main/resources/templates/consent.html | 2 +- src/main/resources/templates/consents.html | 2 +- src/main/resources/templates/error.html | 2 +- src/main/resources/templates/login.html | 2 +- src/main/resources/templates/sca_modal.html | 2 +- 9 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/openbankproject/oauth2/controller/ConsentController.java b/src/main/java/com/openbankproject/oauth2/controller/ConsentController.java index 802084a..2ac10f1 100644 --- a/src/main/java/com/openbankproject/oauth2/controller/ConsentController.java +++ b/src/main/java/com/openbankproject/oauth2/controller/ConsentController.java @@ -71,6 +71,8 @@ public class ConsentController { @Value("${logo.bank.enabled:false}") private String showBankLogo; + @Value("${logo.bank.url:#}") + private String bankLogoUrl; @Value("${obp.base_url:#}") private String obpBaseUrl; @@ -154,6 +156,7 @@ public class ConsentController { model.addAttribute("consents", consents); model.addAttribute("showBankLogo", showBankLogo); model.addAttribute("obpBaseUrl", obpBaseUrl); + model.addAttribute("bankLogoUrl", bankLogoUrl); return "accounts"; } catch (Exception unhandledException) { @@ -173,6 +176,7 @@ public class ConsentController { try { model.addAttribute("showBankLogo", showBankLogo); model.addAttribute("obpBaseUrl", obpBaseUrl); + model.addAttribute("bankLogoUrl", bankLogoUrl); HttpHeaders headers = buildDirectLoginHeader(session); String consentId = (String) session.getAttribute("consent_id"); String authorizationId = (String) session.getAttribute("authorizationId"); @@ -241,6 +245,7 @@ public class ConsentController { try{ model.addAttribute("showBankLogo", showBankLogo); model.addAttribute("obpBaseUrl", obpBaseUrl); + model.addAttribute("bankLogoUrl", bankLogoUrl); if(StringUtils.isNotBlank(deny)) { final RejectRequest rejectRequest = new RejectRequest().error("access_denied").errorDescription("The resource owner denied the request"); final CompletedRequest completedRequest = adminApi.rejectConsentRequest(consent_challenge, rejectRequest); diff --git a/src/main/java/com/openbankproject/oauth2/controller/LoginController.java b/src/main/java/com/openbankproject/oauth2/controller/LoginController.java index 84de219..b7ce86e 100644 --- a/src/main/java/com/openbankproject/oauth2/controller/LoginController.java +++ b/src/main/java/com/openbankproject/oauth2/controller/LoginController.java @@ -66,6 +66,8 @@ public class LoginController implements ServletContextAware { @Value("${logo.bank.enabled:false}") private String showBankLogo; + @Value("${logo.bank.url:#}") + private String bankLogoUrl; /** * initiate global variable @@ -85,6 +87,7 @@ public class LoginController implements ServletContextAware { model.addAttribute("buttonHoverBackgroundColor", buttonHoverBackgroundColor); model.addAttribute("showBankLogo", showBankLogo); model.addAttribute("obpBaseUrl", obpBaseUrl); + model.addAttribute("bankLogoUrl", bankLogoUrl); try { LoginRequest loginRequest = hydraAdmin.getLoginRequest(login_challenge); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 68b8090..b5580d4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -43,4 +43,5 @@ force_jws=BGv1.3 #show_unhandled_errors=false ### Show Bank Logo -#logo.bank.enabled=false \ No newline at end of file +#logo.bank.enabled=false +#logo.bank.url=https://static.openbankproject.com/bank/img/bank-logo.png \ No newline at end of file diff --git a/src/main/resources/templates/accounts.html b/src/main/resources/templates/accounts.html index f2ac087..60cf1ad 100644 --- a/src/main/resources/templates/accounts.html +++ b/src/main/resources/templates/accounts.html @@ -17,7 +17,7 @@ diff --git a/src/main/resources/templates/consent.html b/src/main/resources/templates/consent.html index c053352..b0f30a5 100644 --- a/src/main/resources/templates/consent.html +++ b/src/main/resources/templates/consent.html @@ -18,7 +18,7 @@ diff --git a/src/main/resources/templates/consents.html b/src/main/resources/templates/consents.html index c1b6360..9a6f7c8 100644 --- a/src/main/resources/templates/consents.html +++ b/src/main/resources/templates/consents.html @@ -17,7 +17,7 @@ diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index a7db2b2..2c39ad0 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -18,7 +18,7 @@ diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 68bfd1f..14496ea 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -21,7 +21,7 @@ diff --git a/src/main/resources/templates/sca_modal.html b/src/main/resources/templates/sca_modal.html index 1ff07ed..21e2cf3 100644 --- a/src/main/resources/templates/sca_modal.html +++ b/src/main/resources/templates/sca_modal.html @@ -18,7 +18,7 @@